Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/block/drbd/drbd_main.c

+6 −1
Original line number Diff line number Diff line
@@ -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);