diff options
| author | OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> | 2006-11-03 07:07:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-03 21:27:57 +0100 |
| commit | 2e990021bfc65b1a3778479a9e6b4811f9c1ff0e (patch) | |
| tree | b2572c6fc99d3fc1763a2e9d32d172867d729aac | |
| parent | [PATCH] cifs: ->readpages() fixes (diff) | |
| download | linux-2e990021bfc65b1a3778479a9e6b4811f9c1ff0e.tar.xz linux-2e990021bfc65b1a3778479a9e6b4811f9c1ff0e.zip | |
[PATCH] fuse: ->readpages() cleanup
This just ignore the remaining pages.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Steven French <sfrench@us.ibm.com>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | fs/fuse/file.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 2bb5ace3882d..763a50daf1c0 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -397,14 +397,14 @@ static int fuse_readpages(struct file *file, struct address_space *mapping, err = -EIO; if (is_bad_inode(inode)) - goto clean_pages_up; + goto out; data.file = file; data.inode = inode; data.req = fuse_get_req(fc); err = PTR_ERR(data.req); if (IS_ERR(data.req)) - goto clean_pages_up; + goto out; err = read_cache_pages(mapping, pages, fuse_readpages_fill, &data); if (!err) { @@ -413,10 +413,7 @@ static int fuse_readpages(struct file *file, struct address_space *mapping, else fuse_put_request(fc, data.req); } - return err; - -clean_pages_up: - put_pages_list(pages); +out: return err; } |