Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752637AbaLZAHY (ORCPT ); Thu, 25 Dec 2014 19:07:24 -0500 Received: from mail-pd0-f169.google.com ([209.85.192.169]:59789 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751801AbaLZAGG (ORCPT ); Thu, 25 Dec 2014 19:06:06 -0500 From: Jeremiah Mahler To: Oleg Drokin Cc: Andreas Dilger , Greg Kroah-Hartman , Peng Tao , "Peter Zijlstra (Intel)" , Julia Lawall , Kirill Tkhai , Joe Perches , Zi Shen Lim , Dmitry Eremin , Masaru Nomura , Dan Carpenter , James A Shackleford , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Jeremiah Mahler Subject: [PATCH 2/6] staging: lustre: replace MIN with min_t Date: Thu, 25 Dec 2014 16:04:42 -0800 Message-Id: <1419552286-8492-3-git-send-email-jmmahler@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1419552286-8492-1-git-send-email-jmmahler@gmail.com> References: <1419552286-8492-1-git-send-email-jmmahler@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Switch from MIN to the built in min_t with the int type. Signed-off-by: Jeremiah Mahler --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/