From 2e0ae4bf137e282e825b27b02eb46f86c59d004e Mon Sep 17 00:00:00 2001 From: Andy Voltz Date: Mon, 15 Nov 2010 16:00:38 -0500 Subject: Bump Linux kernel to 2.6.32.25 --- fs/splice.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'fs/splice.c') diff --git a/fs/splice.c b/fs/splice.c index 7394e9e17534..e5efbb96d2bd 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -365,17 +365,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 -- cgit v1.2.3