Commit 6ff4a8ad authored Dec 15, 2014 by Geert Uytterhoeven Committed by David S. Miller Dec 15, 2014

rds: Fix min() warning in rds_message_inc_copy_to_user()



net/rds/message.c: In function ‘rds_message_inc_copy_to_user’:
net/rds/message.c:328: warning: comparison of distinct pointer types lacks a cast

Use min_t(unsigned long, ...) like is done in
rds_message_copy_from_user().

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 50262c85

net/rds/message.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -325,7 +325,8 @@ int rds_message_inc_copy_to_user(struct rds_incoming inc, struct iov_iter to)
		copied = 0;

		while (iov_iter_count(to) && copied < len) {
		to_copy = min(iov_iter_count(to), sg->length - vec_off);
		to_copy = min_t(unsigned long, iov_iter_count(to),
		sg->length - vec_off);
		to_copy = min_t(unsigned long, to_copy, len - copied);

		rds_stats_add(s_copy_to_user, to_copy);

Admin message