diff options
| author | Andreas Gruenbacher <agruen@linbit.com> | 2011-06-27 16:23:33 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2014-02-17 16:45:04 +0100 |
| commit | 0b0ba1efc7b887bc2bd767ef822979fe2dae620e (patch) | |
| tree | cb87bd0b135803615bd76eebb63ddc72bf797b20 /drivers/block/drbd/drbd_state.c | |
| parent | 1ec861ebd0889263841b822ee3f3eb49caf23656 (diff) | |
| download | linux-stable-0b0ba1efc7b887bc2bd767ef822979fe2dae620e.tar.gz linux-stable-0b0ba1efc7b887bc2bd767ef822979fe2dae620e.tar.bz2 linux-stable-0b0ba1efc7b887bc2bd767ef822979fe2dae620e.zip | |
drbd: Add explicit device parameter to D_ASSERT
The implicit dependency on a variable inside the macro is problematic.
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_state.c')
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index e66f725ff169..79d0ea26f373 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -376,7 +376,7 @@ drbd_req_state(struct drbd_device *device, union drbd_state mask, spin_unlock_irqrestore(&first_peer_device(device)->connection->req_lock, flags); if (f & CS_WAIT_COMPLETE && rv == SS_SUCCESS) { - D_ASSERT(current != first_peer_device(device)->connection->worker.task); + D_ASSERT(device, current != first_peer_device(device)->connection->worker.task); wait_for_completion(&done); } @@ -1163,7 +1163,7 @@ static int w_after_state_ch(struct drbd_work *w, int unused) after_state_ch(device, ascw->os, ascw->ns, ascw->flags); if (ascw->flags & CS_WAIT_COMPLETE) { - D_ASSERT(ascw->done != NULL); + D_ASSERT(device, ascw->done != NULL); complete(ascw->done); } kfree(ascw); @@ -1195,7 +1195,7 @@ int drbd_bitmap_io_from_worker(struct drbd_device *device, { int rv; - D_ASSERT(current == first_peer_device(device)->connection->worker.task); + D_ASSERT(device, current == first_peer_device(device)->connection->worker.task); /* open coded non-blocking drbd_suspend_io(device); */ set_bit(SUSPEND_IO, &device->flags); |