mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jeremiah Mahler <jmmahler@gmail.com>
To: Oleg Drokin <oleg.drokin@intel.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Peng Tao <bergwolf@gmail.com>,
	"Peter Zijlstra (Intel)" <peterz@infradead.org>,
	Julia Lawall <Julia.Lawall@lip6.fr>,
	Kirill Tkhai <ktkhai@parallels.com>,
	Joe Perches <joe@perches.com>, Zi Shen Lim <zlim.lnx@gmail.com>,
	Dmitry Eremin <dmitry.eremin@intel.com>,
	Masaru Nomura <massa.nomura@gmail.com>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	James A Shackleford <shack@linux.com>,
	devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
	Jeremiah Mahler <jmmahler@gmail.com>
Subject: [PATCH 4/6] staging: lustre: replace MIN with min, cast (__kernel_size_t)
Date: Thu, 25 Dec 2014 16:04:44 -0800	[thread overview]
Message-ID: <1419552286-8492-5-git-send-email-jmmahler@gmail.com> (raw)
In-Reply-To: <1419552286-8492-1-git-send-email-jmmahler@gmail.com>

Switch from MIN to min and fix the new type warning.  The
warning is produced because a comparison between iov_len,
which is a __kernel_size_t, is made to kiov_len, which is an
unsigned int (include/linux/lnet/types.h).  Fix the warning
by casting kiov_len to __kernel_size_t.

Signed-off-by: Jeremiah Mahler <jmmahler@gmail.com>
---
 drivers/staging/lustre/lnet/lnet/lib-move.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/lustre/lnet/lnet/lib-move.c b/drivers/staging/lustre/lnet/lnet/lib-move.c
index 706c5ee..76eb238 100644
--- a/drivers/staging/lustre/lnet/lnet/lib-move.c
+++ b/drivers/staging/lustre/lnet/lnet/lib-move.c
@@ -403,8 +403,8 @@ lnet_copy_kiov2iov(unsigned int niov, struct iovec *iov, unsigned int iovoffset,
 	do {
 		LASSERT(niov > 0);
 		LASSERT(nkiov > 0);
-		this_nob = MIN(iov->iov_len - iovoffset,
-			       kiov->kiov_len - kiovoffset);
+		this_nob = min(iov->iov_len - iovoffset,
+			       (__kernel_size_t) kiov->kiov_len - kiovoffset);
 		this_nob = min(this_nob, nob);
 
 		if (addr == NULL)
@@ -474,7 +474,7 @@ lnet_copy_iov2kiov(unsigned int nkiov, lnet_kiov_t *kiov,
 	do {
 		LASSERT(nkiov > 0);
 		LASSERT(niov > 0);
-		this_nob = MIN(kiov->kiov_len - kiovoffset,
+		this_nob = min((__kernel_size_t) kiov->kiov_len - kiovoffset,
 			       iov->iov_len - iovoffset);
 		this_nob = min(this_nob, nob);
 
-- 
2.1.4


  parent reply	other threads:[~2014-12-26  0:06 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-26  0:04 [PATCH 0/6] staging: lustre: use built in min/max functions Jeremiah Mahler
2014-12-26  0:04 ` [PATCH 1/6] staging: lustre: use min/max instead of MIN/MAX, simple cases Jeremiah Mahler
2014-12-26  0:04 ` [PATCH 2/6] staging: lustre: replace MIN with min_t Jeremiah Mahler
2014-12-26  0:04 ` [PATCH 3/6] staging: lustre: replace MIN/MAX with min_t/max_t Jeremiah Mahler
2014-12-26  0:04 ` Jeremiah Mahler [this message]
2014-12-26  0:04 ` [PATCH 5/6] staging: lustre: replace MIN with min_t, remove cast Jeremiah Mahler
2014-12-26  0:04 ` [PATCH 6/6] staging: lustre: remove custom MIN/MAX and min_t operations Jeremiah Mahler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1419552286-8492-5-git-send-email-jmmahler@gmail.com \
    --to=jmmahler@gmail.com \
    --cc=Julia.Lawall@lip6.fr \
    --cc=andreas.dilger@intel.com \
    --cc=bergwolf@gmail.com \
    --cc=dan.carpenter@oracle.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=dmitry.eremin@intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=joe@perches.com \
    --cc=ktkhai@parallels.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=massa.nomura@gmail.com \
    --cc=oleg.drokin@intel.com \
    --cc=peterz@infradead.org \
    --cc=shack@linux.com \
    --cc=zlim.lnx@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®