diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2015-03-20 15:47:22 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-11-25 09:22:02 -0700 |
| commit | 2630628b2dbc3fc320aafaf84836119e4e3d62f1 (patch) | |
| tree | 4eb41648cf4d6ecebf1739546b8dff6339bafe78 /drivers/block | |
| parent | 39e91a60c823603d6377cc8fa0b0bf301d1966eb (diff) | |
| download | linux-stable-2630628b2dbc3fc320aafaf84836119e4e3d62f1.tar.gz linux-stable-2630628b2dbc3fc320aafaf84836119e4e3d62f1.tar.bz2 linux-stable-2630628b2dbc3fc320aafaf84836119e4e3d62f1.zip | |
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: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_bitmap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c index 9462d2752850..8bdc34dbaedf 100644 --- a/drivers/block/drbd/drbd_bitmap.c +++ b/drivers/block/drbd/drbd_bitmap.c @@ -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) { |