1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 5d40555b42ba..bb3ad79c14d7 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1055,14 +1055,17 @@ int dm_suspend(struct mapped_device *md)
         if (test_bit(DMF_BLOCK_IO, &md->flags))
                 goto out_read_unlock;
 
-        error = __lock_fs(md);
-        if (error)
-                goto out_read_unlock;
-
         map = dm_get_table(md);
         if (map)
+                /* This does not get reverted if there's an error later. */
                 dm_table_presuspend_targets(map);
 
+        error = __lock_fs(md);
+        if (error) {
+                dm_table_put(map);
+                goto out_read_unlock;
+        }
+
         up_read(&md->lock);
 
         /*
@@ -1121,7 +1124,6 @@ int dm_suspend(struct mapped_device *md)
         return 0;
 
 out_unfreeze:
-        /* FIXME Undo dm_table_presuspend_targets */
         __unlock_fs(md);
         clear_bit(DMF_BLOCK_IO, &md->flags);
 out_write_unlock: