lkml.org 
[lkml]   [2014]   [Dec]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/6] staging: lustre: replace MIN with min, cast (__kernel_size_t)
    Date
    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


    \
     
     \ /
      Last update: 2014-12-26 01:41    [W:5.192 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site