From 3143b742408846a7e9940d608067478cadd33446 Mon Sep 17 00:00:00 2001 From: David Howells Date: Wed, 15 Jun 2011 00:59:04 +0100 Subject: [PATCH] --- yaml --- r: 346091 b: refs/heads/master c: 3b7cd457d0c8458f6a4df2854f75fd80c0338f93 h: refs/heads/master i: 346089: 40555824822c46417919ddcc8881a04a1f5103df 346087: a0c9722188709e25457534882954368e5f7d9b8e v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_int.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 15796d8b9177..39bdd0bac551 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6dff2902208364d058746ee794da4d960f6eec6f +refs/heads/master: 3b7cd457d0c8458f6a4df2854f75fd80c0338f93 diff --git a/trunk/drivers/block/drbd/drbd_int.h b/trunk/drivers/block/drbd/drbd_int.h index ece2e4a991fb..de42c7cf7caf 100644 --- a/trunk/drivers/block/drbd/drbd_int.h +++ b/trunk/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;