Skip to content

Commit

Permalink
[PATCH] fuse: ->readpages() cleanup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
OGAWA Hirofumi authored and Linus Torvalds committed Nov 3, 2006
1 parent 05ac9d4 commit 2e99002
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions fs/fuse/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
}

Expand Down

0 comments on commit 2e99002

Please sign in to comment.