diff options
| author | Andreas Gruenbacher | 2010-12-21 14:46:57 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2011-08-29 11:26:58 +0200 |
| commit | 70dc65e1b3453c5b78ab8ec6bfb604aee7038ae3 (patch) | |
| tree | e273fbfd2fa4dbd4a421d236a23f5261e958ccd8 /drivers/block/drbd/drbd_main.c | |
| parent | drbd: Replace the ERR_IF macro with an assert-like macro (diff) | |
| download | kernel-qcow2-linux-70dc65e1b3453c5b78ab8ec6bfb604aee7038ae3.tar.gz kernel-qcow2-linux-70dc65e1b3453c5b78ab8ec6bfb604aee7038ae3.tar.xz kernel-qcow2-linux-70dc65e1b3453c5b78ab8ec6bfb604aee7038ae3.zip | |
drbd: Remove some useless paranoia code
The open_cnt check is an open-coded D_ASSERT() check.
In case the data.work queue is not empty, it does not really help to
know which drbd_work elements remained on that list: they will be freed
immediately afterwards, anyway.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 46ba4aa03f3f..2902f6dd7bf1 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -3254,16 +3254,8 @@ static void drbd_delete_device(unsigned int minor) return; /* paranoia asserts */ - if (mdev->open_cnt != 0) - dev_err(DEV, "open_cnt = %d in %s:%u", mdev->open_cnt, - __FILE__ , __LINE__); - - if (!expect(list_empty(&mdev->data.work.q))) { - struct list_head *lp; - list_for_each(lp, &mdev->data.work.q) { - dev_err(DEV, "lp = %p\n", lp); - } - }; + D_ASSERT(mdev->open_cnt == 0); + D_ASSERT(list_empty(&mdev->data.work.q)); /* end paranoia asserts */ del_gendisk(mdev->vdisk); |