linux-kernel - [PATCH 2/6] staging: lustre: replace MIN with min

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 25 Dec 2014 16:04:42 -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 2/6] staging: lustre: replace MIN with min_t

Switch from MIN to the built in min_t with the int type.

Signed-off-by: Jeremiah Mahler <jmmahler@...il.com>
---
 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
index 95f1e17..94df05b 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
@@ -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;
-- 
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/