dm cache: set needs_check flag after aborting metadata

commit 6b9973861cb2e96dcd0bb0f1baddc5c034207c5c upstream.

Otherwise the commit that will be aborted will be associated with the
metadata objects that will be torn down.  Must write needs_check flag
to metadata with a reset block manager.

Found through code-inspection (and compared against dm-thin.c).

Cc: stable@vger.kernel.org
Fixes: 028ae9f76f29 ("dm cache: add fail io mode and needs_check flag")
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c
index 03dcb4ec422522e19a7d1a84d371d043b1244027..5979fc3c01d7de0a3e34616494cb81a86f2aedad 100644 (file)
--- a/drivers/md/dm-cache-target.c
+++ b/drivers/md/dm-cache-target.c
@@ -1030,16 +1030,16 @@ static void abort_transaction(struct cache *cache)
        if (get_cache_mode(cache) >= CM_READ_ONLY)
                return;
 
-       if (dm_cache_metadata_set_needs_check(cache->cmd)) {
-               DMERR("%s: failed to set 'needs_check' flag in metadata", dev_name);
-               set_cache_mode(cache, CM_FAIL);
-       }
-
        DMERR_LIMIT("%s: aborting current metadata transaction", dev_name);
        if (dm_cache_metadata_abort(cache->cmd)) {
                DMERR("%s: failed to abort metadata transaction", dev_name);
                set_cache_mode(cache, CM_FAIL);
        }
+
+       if (dm_cache_metadata_set_needs_check(cache->cmd)) {
+               DMERR("%s: failed to set 'needs_check' flag in metadata", dev_name);
+               set_cache_mode(cache, CM_FAIL);
+       }
 }
 
 static void metadata_operation_failed(struct cache *cache, const char *op, int r)