[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1419552286-8492-4-git-send-email-jmmahler@gmail.com>
Date: Thu, 25 Dec 2014 16:04:43 -0800
From: Jeremiah Mahler <jmmahler@...il.com>
To: Oleg Drokin <oleg.drokin@...el.com>
Cc: Andreas Dilger <andreas.dilger@...el.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Peng Tao <bergwolf@...il.com>,
"Peter Zijlstra (Intel)" <peterz@...radead.org>,
Julia Lawall <Julia.Lawall@...6.fr>,
Kirill Tkhai <ktkhai@...allels.com>,
Joe Perches <joe@...ches.com>,
Zi Shen Lim <zlim.lnx@...il.com>,
Dmitry Eremin <dmitry.eremin@...el.com>,
Masaru Nomura <massa.nomura@...il.com>,
Dan Carpenter <dan.carpenter@...cle.com>,
James A Shackleford <shack@...ux.com>,
devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org,
Jeremiah Mahler <jmmahler@...il.com>
Subject: [PATCH 3/6] staging: lustre: replace MIN/MAX with min_t/max_t
Switch from MIN/MAX to min_t/max_t with a size_t type. The size_t type
was chosen because one operand is a size_t and all the others are
immediate integer values.
Signed-off-by: Jeremiah Mahler <jmmahler@...il.com>
---
drivers/staging/lustre/lnet/lnet/router_proc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lnet/lnet/router_proc.c b/drivers/staging/lustre/lnet/lnet/router_proc.c
index 46cde70..c055afc 100644
--- a/drivers/staging/lustre/lnet/lnet/router_proc.c
+++ b/drivers/staging/lustre/lnet/lnet/router_proc.c
@@ -49,7 +49,7 @@ enum {
*/
#define LNET_PROC_CPT_BITS (LNET_CPT_BITS + 1)
/* change version, 16 bits or 8 bits */
-#define LNET_PROC_VER_BITS MAX(((MIN(LNET_LOFFT_BITS, 64)) / 4), 8)
+#define LNET_PROC_VER_BITS max_t(size_t, min_t(size_t, LNET_LOFFT_BITS, 64) / 4, 8)
#define LNET_PROC_HASH_BITS LNET_PEER_HASH_BITS
/*
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists