From da1d62178789a0851a0fff195d14e5809f7cd719 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Tue, 2 May 2006 12:57:18 +0200
Subject: [PATCH] --- yaml --- r: 26458 b: refs/heads/master c:
 7591489a8fbee83f19bacc75756989a6a4d0389c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index edc32779c855..76961de1ee10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 532f57da408c5a5710075d17047e2d97bdfd22f3
+refs/heads/master: 7591489a8fbee83f19bacc75756989a6a4d0389c
diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c
index b150493b6fc3..b0c157d76948 100644
--- a/trunk/fs/splice.c
+++ b/trunk/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;