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

Commit 0ee98e2e authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner
Browse files

drbd: temporarily suspend io in drbd_adm_disk_opts 



drbd_adm_disk_opts() does
	wait_event(mdev->al_wait, lc_try_lock(mdev->act_log));
	drbd_al_shrink(mdev);

If the device is very busy, this can take a very long time to succeed.
Fix this by temporarily suspending IO,
then quickly change the settings, and resume.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 4eb9b3cb

drivers/block/drbd/drbd_nl.c

+2 −0
Original line number Diff line number Diff line
@@ -1210,11 +1210,13 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info) 
		}

	}



	drbd_suspend_io(mdev);

	wait_event(mdev->al_wait, lc_try_lock(mdev->act_log));

	drbd_al_shrink(mdev);

	err = drbd_check_al_size(mdev, new_disk_conf);

	lc_unlock(mdev->act_log);

	wake_up(&mdev->al_wait);

	drbd_resume_io(mdev);



	if (err) {

		retcode = ERR_NOMEM;