Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba5f5d90 authored by Andrew Morton's avatar Andrew Morton Committed by Jens Axboe
Browse files

[PATCH] splice: fix min() warning 



Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJens Axboe <axboe@suse.de>
parent 4d5c34ec

fs/splice.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 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:

find_page:

		/*

		/*

		 * lookup the page for this index

		 * lookup the page for this index