lkml.org 
[lkml]   [2011]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/13] DRBD: Fix comparison always false warning due to long/long long compare
    Date
    From: David Howells <dhowells@redhat.com>

    Fix warnings of the following nature in the drbd header:

    In file included from drivers/block/drbd/drbd_bitmap.c:32:
    drivers/block/drbd/drbd_int.h: In function 'drbd_get_syncer_progress':
    drivers/block/drbd/drbd_int.h:2234: warning: comparison is always false due to limited range of data

    where mdev->rs_total (an unsigned long) is being compared to 1ULL << 32, which
    is always false on a 32-bit machine.

    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
    ---
    drivers/block/drbd/drbd_int.h | 2 +-
    1 files changed, 1 insertions(+), 1 deletions(-)

    diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
    index ece2e4a..de42c7c 100644
    --- a/drivers/block/drbd/drbd_int.h
    +++ b/drivers/block/drbd/drbd_int.h
    @@ -2071,7 +2071,7 @@ static inline void drbd_get_syncer_progress(struct drbd_conf *mdev,
    * Note: currently we don't support such large bitmaps on 32bit
    * arch anyways, but no harm done to be prepared for it here.
    */
    - unsigned int shift = mdev->rs_total >= (1ULL << 32) ? 16 : 10;
    + unsigned int shift = mdev->rs_total > UINT_MAX ? 16 : 10;
    unsigned long left = *bits_left >> shift;
    unsigned long total = 1UL + (mdev->rs_total >> shift);
    unsigned long tmp = 1000UL - left * 1000UL/total;
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-10-12 14:31    [W:0.019 / U:241.520 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site