Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f138ce0 authored by David Howells's avatar David Howells Committed by Philipp Reisner
Browse files

DRBD: Fix comparison always false warning due to long/long long compare 



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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
parent 7948bcdc

drivers/block/drbd/drbd_int.h

+1 −1
Original line number Diff line number Diff line
@@ -2230,7 +2230,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;