drbd: Do not redefine __must_hold()
authorBart Van Assche <[email protected]>
Mon, 25 Jun 2018 22:51:00 +0000 (15:51 -0700)
committerJens Axboe <[email protected]>
Mon, 9 Jul 2018 15:07:52 +0000 (09:07 -0600)
Since __must_hold() is defined in <linux/compiler_types.h>, do not
redefine it in DRBD. Compile-tested only.

Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Bart Van Assche <[email protected]>
Cc: Philipp Reisner <[email protected]>
Cc: Lars Ellenberg <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
drivers/block/drbd/drbd_int.h

index bc4ed2ed40a2462273fa6f8b645ffc01a95c61eb..e35a234b0a8f2a97cf97df7adda7f037d410494a 100644 (file)
 # define __protected_by(x)       __attribute__((require_context(x,1,999,"rdwr")))
 # define __protected_read_by(x)  __attribute__((require_context(x,1,999,"read")))
 # define __protected_write_by(x) __attribute__((require_context(x,1,999,"write")))
-# define __must_hold(x)       __attribute__((context(x,1,1), require_context(x,1,999,"call")))
 #else
 # define __protected_by(x)
 # define __protected_read_by(x)
 # define __protected_write_by(x)
-# define __must_hold(x)
 #endif
 
 /* shared module parameters, defined in drbd_main.c */