diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2009-04-02 19:55:38 +0100 |
|---|---|---|
| committer | Alasdair G Kergon <agk@redhat.com> | 2009-04-02 19:55:38 +0100 |
| commit | 401600dfd368305e641d79db16d514f55c084544 (patch) | |
| tree | 4e1c3f19c52d2bb7d78ec01689d17659960732ab | |
| parent | ef2085870ea448b3c19160d899cf4f948da6a384 (diff) | |
| download | linux-401600dfd368305e641d79db16d514f55c084544.tar.gz linux-401600dfd368305e641d79db16d514f55c084544.tar.bz2 linux-401600dfd368305e641d79db16d514f55c084544.zip | |
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: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
| -rw-r--r-- | drivers/md/dm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 4ba0811f28c5..ae21833b270a 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -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); |