staging: lustre: replace MIN with min_t
authorJeremiah Mahler <jmmahler@gmail.com>
Fri, 26 Dec 2014 00:04:42 +0000 (16:04 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Jan 2015 23:49:21 +0000 (15:49 -0800)
Switch from MIN to the built in min_t with the int type.

Signed-off-by: Jeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c

index 0910a18..92760fe 100644 (file)
@@ -1087,7 +1087,7 @@ ksocknal_new_packet (ksock_conn_t *conn, int nob_to_skip)
        niov = 0;
 
        do {
-               nob = MIN (nob_to_skip, sizeof (ksocknal_slop_buffer));
+               nob = min_t(int, nob_to_skip, sizeof(ksocknal_slop_buffer));
 
                conn->ksnc_rx_iov[niov].iov_base = ksocknal_slop_buffer;
                conn->ksnc_rx_iov[niov].iov_len  = nob;