aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-04-25 15:33:34 +0200
committerJens Axboe <axboe@nelson.home.kernel.dk>2006-04-26 10:33:34 +0200
commitba5f5d90c45a30e4e9a1bd136acf1b3973c905c8 (patch)
tree5f4d3b830e401af51fd91afec3242067d0d88035
parent4d5c34ec7b007cfb0771a36996b009f194acbb2f (diff)
[PATCH] splice: fix min() warning
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jens Axboe <axboe@suse.de>
-rw-r--r--fs/splice.c2
1 files changed, 1 insertions, 1 deletions
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

Privacy Policy