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

Commit d05d1998 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

drbd: Do not redefine __must_hold() 



Since __must_hold() is defined in <linux/compiler_types.h>, do not
redefine it in DRBD. Compile-tested only.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1311326c

drivers/block/drbd/drbd_int.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -55,12 +55,10 @@ 
# define __protected_by(x)       __attribute__((require_context(x,1,999,"rdwr")))

# 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_read_by(x)  __attribute__((require_context(x,1,999,"read")))

# define __protected_write_by(x) __attribute__((require_context(x,1,999,"write")))

# 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

#else

# define __protected_by(x)

# define __protected_by(x)

# define __protected_read_by(x)

# define __protected_read_by(x)

# define __protected_write_by(x)

# define __protected_write_by(x)

# define __must_hold(x)

#endif

#endif





/* shared module parameters, defined in drbd_main.c */

/* shared module parameters, defined in drbd_main.c */