[PATCH] fs: Do not check for valid page->mapping in page_cache_pipe_buf_confirm

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] fs: Do not check for valid page->mapping in page_cache_pipe_buf_confirm

Abhijith Das
If the page is truncated after being spliced into the pipe, it's
probably not invalid.

For filesystems that invalidate pages, we used to return -ENODATA
even though the data is there, it's just possibly different from
what was spliced into the pipe. We shouldn't have to throw away
the buffer or return error in this case.

Signed-off-by: Abhi Das <[hidden email]>
CC: Miklos Szeredi <[hidden email]>
CC: Jens Axboe <[hidden email]>
CC: Al Viro <[hidden email]>
---
 fs/splice.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/fs/splice.c b/fs/splice.c
index dd9bf7e..b9899b99 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -106,15 +106,6 @@ static int page_cache_pipe_buf_confirm(struct pipe_inode_info *pipe,
  lock_page(page);
 
  /*
- * Page got truncated/unhashed. This will cause a 0-byte
- * splice, if this is the first page.
- */
- if (!page->mapping) {
- err = -ENODATA;
- goto error;
- }
-
- /*
  * Uh oh, read-error from disk.
  */
  if (!PageUptodate(page)) {
--
2.4.3