From: Jeremiah Mahler <jmmahler@gmail.com>
Date: Fri, 26 Dec 2014 00:04:45 +0000 (-0800)
Subject: staging: lustre: replace MIN with min_t, remove cast
X-Git-Tag: firefly_0821_release~176^2~2320^2~315
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=28b12e41683e6722a0c4d058fdf69be845e4832b;p=firefly-linux-kernel-4.4.55.git

staging: lustre: replace MIN with min_t, remove cast

Switch from MIN to min_t and remove the previous cast of the second
argument to int.

Signed-off-by: Jeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/lustre/lnet/lnet/lib-move.c b/drivers/staging/lustre/lnet/lnet/lib-move.c
index 39e27c1be337..ed6eec9bd2cc 100644
--- a/drivers/staging/lustre/lnet/lnet/lib-move.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-move.c
@@ -1530,7 +1530,7 @@ lnet_parse_reply(lnet_ni_t *ni, lnet_msg_t *msg)
 	LASSERT(md->md_offset == 0);
 
 	rlength = hdr->payload_length;
-	mlength = MIN(rlength, (int)md->md_length);
+	mlength = min_t(int, rlength, md->md_length);
 
 	if (mlength < rlength &&
 	    (md->md_options & LNET_MD_TRUNCATE) == 0) {