Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2e990021bfc65b1a3778479a9e6b4811f9c1ff0e

Authored by OGAWA Hirofumi
Committed by Linus Torvalds
1 parent 05ac9d4b3d

[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>

Showing 1 changed file with 3 additions and 6 deletions Side-by-side Diff

... ... @@ -397,14 +397,14 @@
397 397  
398 398 err = -EIO;
399 399 if (is_bad_inode(inode))
400   - goto clean_pages_up;
  400 + goto out;
401 401  
402 402 data.file = file;
403 403 data.inode = inode;
404 404 data.req = fuse_get_req(fc);
405 405 err = PTR_ERR(data.req);
406 406 if (IS_ERR(data.req))
407   - goto clean_pages_up;
  407 + goto out;
408 408  
409 409 err = read_cache_pages(mapping, pages, fuse_readpages_fill, &data);
410 410 if (!err) {
... ... @@ -413,10 +413,7 @@
413 413 else
414 414 fuse_put_request(fc, data.req);
415 415 }
416   - return err;
417   -
418   -clean_pages_up:
419   - put_pages_list(pages);
  416 +out:
420 417 return err;
421 418 }
422 419