AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

dm: allow uninterruptible wait for pending io

Browse Source 
Allow uninterruptible wait for pending IOs.

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

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Mikulas Patocka 2009-04-02 19:55:38 +01:00 committed by Alasdair G Kergon
parent ef2085870e
commit 401600dfd3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/md/dm.c
View File

@ -1375,18 +1375,19 @@ void dm_put(struct mapped_device *md)
} }
EXPORT_SYMBOL_GPL(dm_put); 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; int r = 0;
while (1) { while (1) {
set_current_state(TASK_INTERRUPTIBLE); set_current_state(interruptible);
smp_mb(); smp_mb();
if (!atomic_read(&md->pending)) if (!atomic_read(&md->pending))
break; break;
if (signal_pending(current)) { if (interruptible == TASK_INTERRUPTIBLE &&
signal_pending(current)) {
r = -EINTR; r = -EINTR;
break; break;
} }
@ -1565,7 +1566,7 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags)
/* /*
* Wait for the already-mapped ios to complete. * 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); down_write(&md->io_lock);
remove_wait_queue(&md->wait, &wait); remove_wait_queue(&md->wait, &wait);