---

yaml --- r: 40653 b: refs/heads/master c: 2e99002 h: refs/heads/master i: 40651: 9485829 v: v3
git-mirror · Nov 3, 2006 · 85d91b8 · 85d91b8
1 parent 8df213e
commit 85d91b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -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;
 }