From: Alasdair G Kergon Handle error from __lock_fs() Signed-Off-By: Alasdair G Kergon From: Christoph Hellwig Signed-off-by: Andrew Morton --- drivers/md/dm.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff -puN drivers/md/dm.c~device-mapper-handle-__lock_fs-error drivers/md/dm.c --- 25/drivers/md/dm.c~device-mapper-handle-__lock_fs-error Wed May 4 13:10:27 2005 +++ 25-akpm/drivers/md/dm.c Wed May 4 13:10:27 2005 @@ -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); _