[PATCH 07/30] drbd: adjust assert in w_bitmap_io to account for BM_LOCKED_CHANGE_ALLOWED

[Philipp Reisner]

From: Lars Ellenberg <lars.ellenb...@linbit.com>

Signed-off-by: Philipp Reisner <philipp.reis...@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenb...@linbit.com>
---
 drivers/block/drbd/drbd_main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 3cecc4f..3127bba 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -3521,7 +3521,12 @@ static int w_bitmap_io(struct drbd_work *w, int unused)
        struct bm_io_work *work = &device->bm_io_work;
        int rv = -EIO;
 
-       D_ASSERT(device, atomic_read(&device->ap_bio_cnt) == 0);
+       if (work->flags != BM_LOCKED_CHANGE_ALLOWED) {
+               int cnt = atomic_read(&device->ap_bio_cnt);
+               if (cnt)
+                       drbd_err(device, "FIXME: ap_bio_cnt %d, expected 0; 
queued for '%s'\n",
+                                       cnt, work->why);
+       }
 
        if (get_ldev(device)) {
                drbd_bm_lock(device, work->why, work->flags);
-- 
1.9.1