---

yaml --- r: 208325 b: refs/heads/master c: 6965031 h: refs/heads/master i: 208323: 4846444 v: v3
git-mirror · Aug 7, 2010 · 1f7872c · 1f7872c
1 parent 2d06ff7
commit 1f7872c
Show file tree

Hide file tree

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