summaryrefslogtreecommitdiffstats
path: root/drivers/staging/lustre/lnet/selftest/conrpc.h
diff options
context:
space:
mode:
authorJeremiah Mahler <jmmahler@gmail.com>2014-12-25 16:04:41 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-17 15:49:21 -0800
commit0c5754178d8b39e5709da82873f0a6d975ea92f5 (patch)
treeecbf6448111a40f2a03567938ad59439094ba82a /drivers/staging/lustre/lnet/selftest/conrpc.h
parent3f3af378f5d7e9085496a064ef2b0c3b35a8a62c (diff)
downloadlinux-0c5754178d8b39e5709da82873f0a6d975ea92f5.tar.bz2
staging: lustre: use min/max instead of MIN/MAX, simple cases
Custom MIN/MAX operations are being used which are not as robust as the built in min/max operations which will warn about potentially problematic type comparisons. For the simple cases, where no type warning is produced, simply replace MIN/MAX with min/max. Signed-off-by: Jeremiah Mahler <jmmahler@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lnet/selftest/conrpc.h')
-rw-r--r--drivers/staging/lustre/lnet/selftest/conrpc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.h b/drivers/staging/lustre/lnet/selftest/conrpc.h
index fc1cb56cbab2..2353889c6eac 100644
--- a/drivers/staging/lustre/lnet/selftest/conrpc.h
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.h
@@ -54,7 +54,7 @@
#define LST_TRANS_TIMEOUT 30
#define LST_TRANS_MIN_TIMEOUT 3
-#define LST_VALIDATE_TIMEOUT(t) MIN(MAX(t, LST_TRANS_MIN_TIMEOUT), LST_TRANS_TIMEOUT)
+#define LST_VALIDATE_TIMEOUT(t) min(max(t, LST_TRANS_MIN_TIMEOUT), LST_TRANS_TIMEOUT)
#define LST_PING_INTERVAL 8