Commit bca1cbae authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Jens Axboe

drbd: adjust assert in w_bitmap_io to account for BM_LOCKED_CHANGE_ALLOWED

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 92d94ae6
...@@ -3523,7 +3523,12 @@ static int w_bitmap_io(struct drbd_work *w, int unused) ...@@ -3523,7 +3523,12 @@ static int w_bitmap_io(struct drbd_work *w, int unused)
struct bm_io_work *work = &device->bm_io_work; struct bm_io_work *work = &device->bm_io_work;
int rv = -EIO; 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)) { if (get_ldev(device)) {
drbd_bm_lock(device, work->why, work->flags); drbd_bm_lock(device, work->why, work->flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment