diff options
| author | Andreas Gruenbacher <andreas.gruenbacher@gmail.com> | 2014-09-11 16:29:09 +0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-09-11 18:41:29 +0400 |
| commit | d1b8085356391d1d5151670ab96baae6234d1e20 (patch) | |
| tree | cf3c716ef05aed6582fbeca281a5529cf34c7ae8 /drivers/block/drbd/drbd_worker.c | |
| parent | 8d4ba3f0fa53044b8b597caaa7d8e291e6e84642 (diff) | |
| download | linux-d1b8085356391d1d5151670ab96baae6234d1e20.tar.xz | |
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>
Diffstat (limited to 'drivers/block/drbd/drbd_worker.c')
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 6e01e62c58a0..b20cd214d371 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -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); } |