diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-04-25 09:33:34 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@nelson.home.kernel.dk> | 2006-04-26 04:33:34 -0400 |
| commit | ba5f5d90c45a30e4e9a1bd136acf1b3973c905c8 (patch) | |
| tree | 5f4d3b830e401af51fd91afec3242067d0d88035 /fs/splice.c | |
| parent | 4d5c34ec7b007cfb0771a36996b009f194acbb2f (diff) | |
[PATCH] splice: fix min() warning
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'fs/splice.c')
| -rw-r--r-- | fs/splice.c | 2 |
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, | |||
| 283 | /* | 283 | /* |
| 284 | * this_len is the max we'll use from this page | 284 | * this_len is the max we'll use from this page |
| 285 | */ | 285 | */ |
| 286 | this_len = min(len, PAGE_CACHE_SIZE - loff); | 286 | this_len = min_t(unsigned long, len, PAGE_CACHE_SIZE - loff); |
| 287 | find_page: | 287 | find_page: |
| 288 | /* | 288 | /* |
| 289 | * lookup the page for this index | 289 | * lookup the page for this index |