leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drbd: Get rid of the __no_warn and __cond_lock macros

Browse Source 
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:
Andreas Gruenbacher 2014-09-11 14:29:09 +02:00 committed by Jens Axboe
parent 8d4ba3f0fa
commit d1b8085356
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/block/drbd/drbd_int.h
View File

@ -61,8 +61,6 @@
# define __must_hold(x) # define __must_hold(x)
#endif #endif
#define __no_warn(lock, stmt) do { __acquire(lock); stmt; __release(lock); } while (0)
/* module parameter, defined in drbd_main.c */ /* module parameter, defined in drbd_main.c */
extern unsigned int minor_count; extern unsigned int minor_count;
extern bool disable_sendpage; 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 * 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. * 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(_device, _min_state) \
#define get_ldev_if_state(M,MINS) __cond_lock(local, _get_ldev_if_state(M,MINS)) (_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) static inline void put_ldev(struct drbd_device *device)
{ {

7
drivers/block/drbd/drbd_worker.c
View File

@ -1853,9 +1853,12 @@ static void drbd_ldev_destroy(struct drbd_device *device)
device->resync = NULL; device->resync = NULL;
lc_destroy(device->act_log); lc_destroy(device->act_log);
device->act_log = NULL; device->act_log = NULL;
__no_warn(local,
__acquire(local);
drbd_free_ldev(device->ldev); drbd_free_ldev(device->ldev);
device->ldev = NULL;); device->ldev = NULL;
__release(local);
clear_bit(GOING_DISKLESS, &device->flags); clear_bit(GOING_DISKLESS, &device->flags);
wake_up(&device->misc_wait); wake_up(&device->misc_wait);
} }