nilfs2: allow nilfs_dirty_inode to mark metadata file inodes dirty

[deliverable/linux.git] / fs / splice.c

diff --git a/fs/splice.c b/fs/splice.c
index ec11c52d646d001b520c3a38a4e0832e58dfae5c..8f1dfaecc8f06125429d3bc66b052d779f61f446 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -399,17 +399,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
                 * If the page isn't uptodate, we may need to start io on it
                 */
                if (!PageUptodate(page)) {
-                       /*
-                        * If in nonblock mode then dont block on waiting
-                        * for an in-flight io page
-                        */
-                       if (flags & SPLICE_F_NONBLOCK) {
-                               if (!trylock_page(page)) {
-                                       error = -EAGAIN;
-                                       break;
-                               }
-                       } else
-                               lock_page(page);
+                       lock_page(page);
 
                        /*
                         * Page was truncated, or invalidated by the