From 1f7872c92a9fa1f7d9cb9c3a0924c13574515a9b Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Tue, 3 Aug 2010 12:48:50 +0200
Subject: [PATCH] --- yaml --- r: 208325 b: refs/heads/master c:
 6965031d331a642e31278fa1b5bd47f372ffdd5d h: refs/heads/master i:   208323:
 48464444be58292e3f89b2ea8666d39e44178573 v: v3

---
 [refs]            |  2 +-
 trunk/fs/splice.c | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 561a8d7b2650..1b07ed34968f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7901d14144311c930918b1222aae7611284c63eb
+refs/heads/master: 6965031d331a642e31278fa1b5bd47f372ffdd5d
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
index ec11c52d646d..8f1dfaecc8f0 100644
--- a/trunk/fs/splice.c
+++ b/trunk/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