From 85d91b8a8cfad1438f7e8e1b90a34f00d3c8c32f Mon Sep 17 00:00:00 2001 From: OGAWA Hirofumi Date: Thu, 2 Nov 2006 22:07:09 -0800 Subject: [PATCH] --- yaml --- r: 40653 b: refs/heads/master c: 2e990021bfc65b1a3778479a9e6b4811f9c1ff0e h: refs/heads/master i: 40651: 9485829bcb8f3572226e3cfc5ac32c280c315604 v: v3 --- [refs] | 2 +- trunk/fs/fuse/file.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5731dad8e861..fc50f2d5aee2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05ac9d4b3d7eac9e8542c83341a0e22d09aecf8f +refs/heads/master: 2e990021bfc65b1a3778479a9e6b4811f9c1ff0e diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c index 2bb5ace3882d..763a50daf1c0 100644 --- a/trunk/fs/fuse/file.c +++ b/trunk/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; }