Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e990021 authored by OGAWA Hirofumi's avatar OGAWA Hirofumi Committed by Linus Torvalds
Browse files

[PATCH] fuse: ->readpages() cleanup 



This just ignore the remaining pages.

Signed-off-by: default avatarOGAWA 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 05ac9d4b

fs/fuse/file.c

+3 −6
Original line number Diff line number Diff line
@@ -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;

}