Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / net / rds / message.c

diff --git a/net/rds/message.c b/net/rds/message.c
index ff2202218187530378b270b0df4838286cb9fc14..5a21e6f5986f1b822e41077f54f5f6235fe47068 100644 (file)
--- a/net/rds/message.c
+++ b/net/rds/message.c
@@ -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);