diff options
| author | Maxim Patlasov <MPatlasov@parallels.com> | 2013-10-02 15:01:07 +0400 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@suse.cz> | 2013-11-05 10:11:26 +0100 |
| commit | f6011081f5e290756bd90fe96f1e86d3eac76f77 (patch) | |
| tree | 12c724c1dcb89f2618ff39457941593f10749a96 /fs/fuse | |
| parent | cb2ffb26e67ef89c44f46e971440cda2f83ae236 (diff) | |
| download | linux-stable-f6011081f5e290756bd90fe96f1e86d3eac76f77.tar.gz linux-stable-f6011081f5e290756bd90fe96f1e86d3eac76f77.tar.bz2 linux-stable-f6011081f5e290756bd90fe96f1e86d3eac76f77.zip | |
fuse: writepages: roll back changes if request not found
fuse_writepage_in_flight() returns false if it fails to find request with
given index in fi->writepages. Then the caller proceeds with populating
data->orig_pages[] and incrementing req->num_pages. Hence,
fuse_writepage_in_flight() must revert changes it made in request before
returning false.
Signed-off-by: Maxim Patlasov <MPatlasov@parallels.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/file.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 135360e2b9e5..077b03844998 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1649,7 +1649,6 @@ static bool fuse_writepage_in_flight(struct fuse_req *new_req, spin_lock(&fc->lock); list_del(&new_req->writepages_entry); - new_req->num_pages = 1; list_for_each_entry(old_req, &fi->writepages, writepages_entry) { BUG_ON(old_req->inode != new_req->inode); curr_index = old_req->misc.write.in.offset >> PAGE_CACHE_SHIFT; @@ -1659,9 +1658,12 @@ static bool fuse_writepage_in_flight(struct fuse_req *new_req, break; } } - if (!found) + if (!found) { + list_add(&new_req->writepages_entry, &fi->writepages); goto out_unlock; + } + new_req->num_pages = 1; for (tmp = old_req; tmp != NULL; tmp = tmp->misc.write.next) { BUG_ON(tmp->inode != new_req->inode); curr_index = tmp->misc.write.in.offset >> PAGE_CACHE_SHIFT; |