diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2014-12-15 13:21:42 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-15 17:49:09 +0100 |
| commit | 6ff4a8ad4b6eae5171754fb60418bc81834aa09b (patch) | |
| tree | 901bd100a2583fcef6a3605d335f138f9b5e47ad /net | |
| parent | net: stmmac: sti: Fix uninitialized pointer dereference if !OF (diff) | |
| download | linux-6ff4a8ad4b6eae5171754fb60418bc81834aa09b.tar.xz linux-6ff4a8ad4b6eae5171754fb60418bc81834aa09b.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/rds/message.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/rds/message.c b/net/rds/message.c index ff2202218187..5a21e6f5986f 100644 --- 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); |