drbd: adjust assert in w_bitmap_io to account for BM_LOCKED_CHANGE_ALLOWED

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>

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index b0891c3651dd522e662b0ef3379801b6e5a55f71..64e9525cd033ba45f3157fe456a1981d781ebaac 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -3523,7 +3523,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);