drbd: Get rid of the __no_warn and __cond_lock macros
These macros can easily be replaced with its definition. 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>
This commit is contained in:
parent
8d4ba3f0fa
commit
d1b8085356
|
@ -61,8 +61,6 @@
|
|||
# define __must_hold(x)
|
||||
#endif
|
||||
|
||||
#define __no_warn(lock, stmt) do { __acquire(lock); stmt; __release(lock); } while (0)
|
||||
|
||||
/* module parameter, defined in drbd_main.c */
|
||||
extern unsigned int minor_count;
|
||||
extern bool disable_sendpage;
|
||||
|
@ -2100,12 +2098,15 @@ static inline bool is_sync_state(enum drbd_conns connection_state)
|
|||
|
||||
/**
|
||||
* get_ldev() - Increase the ref count on device->ldev. Returns 0 if there is no ldev
|
||||
* @M: DRBD device.
|
||||
* @_device: DRBD device.
|
||||
* @_min_state: Minimum device state required for success.
|
||||
*
|
||||
* You have to call put_ldev() when finished working with device->ldev.
|
||||
*/
|
||||
#define get_ldev(M) __cond_lock(local, _get_ldev_if_state(M,D_INCONSISTENT))
|
||||
#define get_ldev_if_state(M,MINS) __cond_lock(local, _get_ldev_if_state(M,MINS))
|
||||
#define get_ldev_if_state(_device, _min_state) \
|
||||
(_get_ldev_if_state((_device), (_min_state)) ? \
|
||||
({ __acquire(x); true; }) : false)
|
||||
#define get_ldev(_device) get_ldev_if_state(_device, D_INCONSISTENT)
|
||||
|
||||
static inline void put_ldev(struct drbd_device *device)
|
||||
{
|
||||
|
|
|
@ -1853,9 +1853,12 @@ static void drbd_ldev_destroy(struct drbd_device *device)
|
|||
device->resync = NULL;
|
||||
lc_destroy(device->act_log);
|
||||
device->act_log = NULL;
|
||||
__no_warn(local,
|
||||
drbd_free_ldev(device->ldev);
|
||||
device->ldev = NULL;);
|
||||
|
||||
__acquire(local);
|
||||
drbd_free_ldev(device->ldev);
|
||||
device->ldev = NULL;
|
||||
__release(local);
|
||||
|
||||
clear_bit(GOING_DISKLESS, &device->flags);
|
||||
wake_up(&device->misc_wait);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue