drbd: avoid redefinition of BITS_PER_PAGE
authorLars Ellenberg <lars.ellenberg@linbit.com>
Fri, 20 Mar 2015 14:47:22 +0000 (15:47 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 May 2017 05:46:01 +0000 (07:46 +0200)
commitee6b88767e872fcc7af8e786a05d29d1ba229e75
tree60d50fc2fcb354446ec55d92c4af2a00573336ad
parent938206b8d7980c60644d2ac46b13c3d236cb3eab
drbd: avoid redefinition of BITS_PER_PAGE

commit 2630628b2dbc3fc320aafaf84836119e4e3d62f1 upstream.

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>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/block/drbd/drbd_bitmap.c