Commit 7be5382e authored by Joe Thornber's avatar Joe Thornber Committed by Linus Torvalds

[PATCH] dm: dm_suspend locking fix

dm_suspend(): Stop holding the read lock around the while loop that
waits for pending io to complete.
parent 121fd6eb
...@@ -715,15 +715,13 @@ int dm_suspend(struct mapped_device *md) ...@@ -715,15 +715,13 @@ int dm_suspend(struct mapped_device *md)
} }
set_bit(DMF_BLOCK_IO, &md->flags); set_bit(DMF_BLOCK_IO, &md->flags);
add_wait_queue(&md->wait, &wait);
up_write(&md->lock); up_write(&md->lock);
/* /*
* Then we wait for the already mapped ios to * Then we wait for the already mapped ios to
* complete. * complete.
*/ */
down_read(&md->lock);
add_wait_queue(&md->wait, &wait);
while (1) { while (1) {
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
...@@ -734,11 +732,11 @@ int dm_suspend(struct mapped_device *md) ...@@ -734,11 +732,11 @@ int dm_suspend(struct mapped_device *md)
} }
current->state = TASK_RUNNING; current->state = TASK_RUNNING;
remove_wait_queue(&md->wait, &wait);
up_read(&md->lock);
/* set_bit is atomic */ down_write(&md->lock);
remove_wait_queue(&md->wait, &wait);
set_bit(DMF_SUSPENDED, &md->flags); set_bit(DMF_SUSPENDED, &md->flags);
up_write(&md->lock);
return 0; return 0;
} }
......
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