X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fsplice.c;h=1bbc6f4bb09cb850cec29e64ea34bfabe083bb3b;hb=48fd4f93a00eac844678629f2f00518e146ed30d;hp=b30311ba8af6ff23ee45af51d07655e68c98fad2;hpb=9ee08c2df47c10ba624ff05a6c0f2500748bcb69;p=linux-2.6

diff --git a/fs/splice.c b/fs/splice.c
index b30311ba8a..1bbc6f4bb0 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -371,7 +371,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
 			 * for an in-flight io page
 			 */
 			if (flags & SPLICE_F_NONBLOCK) {
-				if (TestSetPageLocked(page)) {
+				if (!trylock_page(page)) {
 					error = -EAGAIN;
 					break;
 				}