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

Commit 401600df authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Alasdair G Kergon
Browse files

dm: allow uninterruptible wait for pending io 



Allow uninterruptible wait for pending IOs.

Add argument "interruptible" to dm_wait_for_completion that specifies
either interruptible or uninterruptible waiting.

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent ef208587

drivers/md/dm.c

+5 −4
Original line number Diff line number Diff line
@@ -1375,18 +1375,19 @@ void dm_put(struct mapped_device *md) 
}

EXPORT_SYMBOL_GPL(dm_put);



static int dm_wait_for_completion(struct mapped_device *md)

static int dm_wait_for_completion(struct mapped_device *md, int interruptible)

{

	int r = 0;



	while (1) {

		set_current_state(TASK_INTERRUPTIBLE);

		set_current_state(interruptible);



		smp_mb();

		if (!atomic_read(&md->pending))

			break;



		if (signal_pending(current)) {

		if (interruptible == TASK_INTERRUPTIBLE &&

		    signal_pending(current)) {

			r = -EINTR;

			break;

		}
@@ -1565,7 +1566,7 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags) 
	/*

	 * Wait for the already-mapped ios to complete.

	 */

	r = dm_wait_for_completion(md);

	r = dm_wait_for_completion(md, TASK_INTERRUPTIBLE);



	down_write(&md->io_lock);

	remove_wait_queue(&md->wait, &wait);