---

yaml --- r: 346091 b: refs/heads/master c: 3b7cd45 h: refs/heads/master i: 346089: 4055582 346087: a0c9722 v: v3
git-mirror · Nov 8, 2012 · 3143b74 · 3143b74
1 parent cb59346
commit 3143b74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;