From: Andrew Morton <akpm@osdl.org>
Date: Tue, 25 Apr 2006 13:33:34 +0000 (+0200)
Subject: [PATCH] splice: fix min() warning
X-Git-Tag: MMI-PSA29.97-13-9~49969^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ba5f5d90c45a30e4e9a1bd136acf1b3973c905c8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[PATCH] splice: fix min() warning

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jens Axboe <axboe@suse.de>
---

diff --git a/fs/splice.c b/fs/splice.c
index 0559e7577a04..4aa67254740f 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -283,7 +283,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
 		/*
 		 * this_len is the max we'll use from this page
 		 */
-		this_len = min(len, PAGE_CACHE_SIZE - loff);
+		this_len = min_t(unsigned long, len, PAGE_CACHE_SIZE - loff);
 find_page:
 		/*
 		 * lookup the page for this index