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

Commit 2630628b authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Jens Axboe
Browse files

drbd: avoid redefinition of BITS_PER_PAGE 



Apparently we now implicitly get definitions for BITS_PER_PAGE and
BITS_PER_PAGE_MASK from the pid_namespace.h

Instead of renaming our defines, I chose to define only if not yet
defined, but to double check the value if already defined.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 39e91a60

drivers/block/drbd/drbd_bitmap.c

+6 −0
Original line number Diff line number Diff line
@@ -479,8 +479,14 @@ void drbd_bm_cleanup(struct drbd_device *device) 
 * this masks out the remaining bits.

 * Returns the number of bits cleared.

 */

#ifndef BITS_PER_PAGE

#define BITS_PER_PAGE		(1UL << (PAGE_SHIFT + 3))

#define BITS_PER_PAGE_MASK	(BITS_PER_PAGE - 1)

#else

# if BITS_PER_PAGE != (1UL << (PAGE_SHIFT + 3))

#  error "ambiguous BITS_PER_PAGE"

# endif

#endif

#define BITS_PER_LONG_MASK	(BITS_PER_LONG - 1)

static int bm_clear_surplus(struct drbd_bitmap *b)

{