summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlasdair G Kergon <agk@redhat.com>2005-05-05 16:16:05 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-05 16:36:45 -0700
commit354e007121de546e50b5592c2557575117435522 (patch)
treefb5b080a7ca3bc5cda561ce75f25976a03f04bc4
parentdfbe03f6d09fcebf85ae2a2cbb4ceee9b0985e67 (diff)
downloadop-kernel-dev-354e007121de546e50b5592c2557575117435522.zip
op-kernel-dev-354e007121de546e50b5592c2557575117435522.tar.gz
[PATCH] device-mapper: handle __lock_fs error
Handle error from __lock_fs() Signed-Off-By: Alasdair G Kergon <agk@redhat.com> From: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/md/dm.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 9687a08..83f53a4 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1048,6 +1048,7 @@ int dm_suspend(struct mapped_device *md)
{
struct dm_table *map;
DECLARE_WAITQUEUE(wait, current);
+ int error;
/* Flush I/O to the device. */
down_read(&md->lock);
@@ -1056,25 +1057,29 @@ int dm_suspend(struct mapped_device *md)
return -EINVAL;
}
+ error = __lock_fs(md);
+ if (error) {
+ up_read(&md->lock);
+ return error;
+ }
+
map = dm_get_table(md);
if (map)
dm_table_presuspend_targets(map);
- __lock_fs(md);
up_read(&md->lock);
/*
- * First we set the BLOCK_IO flag so no more ios will be
- * mapped.
+ * First we set the BLOCK_IO flag so no more ios will be mapped.
+ *
+ * If the flag is already set we know another thread is trying to
+ * suspend as well, so we leave the fs locked for this thread.
*/
down_write(&md->lock);
if (test_bit(DMF_BLOCK_IO, &md->flags)) {
- /*
- * If we get here we know another thread is
- * trying to suspend as well, so we leave the fs
- * locked for this thread.
- */
up_write(&md->lock);
+ if (map)
+ dm_table_put(map);
return -EINVAL;
}
@@ -1107,6 +1112,7 @@ int dm_suspend(struct mapped_device *md)
/* were we interrupted ? */
if (atomic_read(&md->pending)) {
+ /* FIXME Undo the presuspend_targets */
__unlock_fs(md);
clear_bit(DMF_BLOCK_IO, &md->flags);
up_write(&md->lock);
OpenPOWER on IntegriCloud