From: Jens Axboe <axboe@suse.de>
Date: Tue, 2 May 2006 10:57:18 +0000 (+0200)
Subject: [PATCH] vmsplice: fix badly placed end paranthesis
X-Git-Tag: v2.6.17-rc4~60
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7591489a8fbee83f19bacc75756989a6a4d0389c;p=linux-2.6-omap-h63xx.git

[PATCH] vmsplice: fix badly placed end paranthesis

We need to use the minium of {len, PAGE_SIZE-off}, not {len, PAGE_SIZE}-off.
The latter doesn't make any sense, and could cause us to attempt negative
length transfers...

Signed-off-by: Jens Axboe <axboe@suse.de>
---

diff --git a/fs/splice.c b/fs/splice.c
index b150493b6fc..b0c157d7694 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -1143,7 +1143,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
 		 * Fill this contiguous range into the partial page map.
 		 */
 		for (i = 0; i < error; i++) {
-			const int plen = min_t(size_t, len, PAGE_SIZE) - off;
+			const int plen = min_t(size_t, len, PAGE_SIZE - off);
 
 			partial[buffers].offset = off;
 			partial[buffers].len = plen;