Commit 9cf766a4 authored by Christoph Böhmwalder's avatar Christoph Böhmwalder Committed by Jens Axboe

drbd: remove macros using require_context

This require_context attribute originated in a proposed sparse patch by
Philipp Reisner back in 2008. Johannes Berg had a different solution to
a similar problem, and that patch "won" in the end; so the require_context
thing never got merged. The whole history can be read at [0].

DRBD kept using these annotations anyway for a while. Nowadays, on a
modern unmodified sparse, they obviously do nothing, and they are hardly
used anymore anyway.

So, just remove the definitions of these macros.

[0] https://www.spinics.net/lists/linux-sparse/msg01150.htmlSigned-off-by: default avatarChristoph Böhmwalder <christoph.boehmwalder@linbit.com>
Reviewed-by: default avatarJoel Colledge <joel.colledge@linbit.com>
Link: https://lore.kernel.org/r/20230113123538.144276-6-christoph.boehmwalder@linbit.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 06918200
...@@ -40,16 +40,6 @@ ...@@ -40,16 +40,6 @@
#include "drbd_protocol.h" #include "drbd_protocol.h"
#include "drbd_polymorph_printk.h" #include "drbd_polymorph_printk.h"
#ifdef __CHECKER__
# 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")))
#else
# define __protected_by(x)
# define __protected_read_by(x)
# define __protected_write_by(x)
#endif
/* shared module parameters, defined in drbd_main.c */ /* shared module parameters, defined in drbd_main.c */
#ifdef CONFIG_DRBD_FAULT_INJECTION #ifdef CONFIG_DRBD_FAULT_INJECTION
extern int drbd_enable_faults; extern int drbd_enable_faults;
...@@ -775,7 +765,7 @@ struct drbd_device { ...@@ -775,7 +765,7 @@ struct drbd_device {
unsigned long flags; unsigned long flags;
/* configured by drbdsetup */ /* configured by drbdsetup */
struct drbd_backing_dev *ldev __protected_by(local); struct drbd_backing_dev *ldev;
sector_t p_size; /* partner's disk size */ sector_t p_size; /* partner's disk size */
struct request_queue *rq_queue; struct request_queue *rq_queue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment