dm era: save spacemap metadata root after the pre-commit

commit 117aceb030307dcd431fdcff87ce988d3016c34a upstream.

When committing era metadata to disk, it doesn't always save the latest
spacemap metadata root in superblock. Due to this, metadata is getting
corrupted sometimes when reopening the device. The correct order of update
should be, pre-commit (shadows spacemap root), save the spacemap root
(newly shadowed block) to in-core superblock and then the final commit.

Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/md/dm-era-target.c b/drivers/md/dm-era-target.c
index bf2b2676cb8af7c936b401c64895f9e499e80543..80e3df1f1f7dea8297bf99233c5de680a26f5330 100644 (file)
--- a/drivers/md/dm-era-target.c
+++ b/drivers/md/dm-era-target.c
@@ -961,15 +961,15 @@ static int metadata_commit(struct era_metadata *md)
                }
        }
 
-       r = save_sm_root(md);
+       r = dm_tm_pre_commit(md->tm);
        if (r) {
-               DMERR("%s: save_sm_root failed", __func__);
+               DMERR("%s: pre commit failed", __func__);
                return r;
        }
 
-       r = dm_tm_pre_commit(md->tm);
+       r = save_sm_root(md);
        if (r) {
-               DMERR("%s: pre commit failed", __func__);
+               DMERR("%s: save_sm_root failed", __func__);
                return r;
        }