dm-crypt: fix warning in shutdown path

The counter for the number of allocated pages includes pages in the mempool's reserve, so checking that the number of allocated pages is 0 needs to happen after we exit the mempool. Fixes: 6f1c819 ("dm: convert to bioset_init()/mempool_init()") Signed-off-by: Kent Overstreet <[email protected]> Reported-by: Krzysztof Kozlowski <[email protected]> Acked-by: Mike Snitzer <[email protected]> Fixed to always just use percpu_counter_sum() Signed-off-by: Jens Axboe <[email protected]>
vieko · Jun 3, 2018 · d00a11d · d00a11d
1 parent 9cfd5a9
commit d00a11d
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
@@ -2221,14 +2221,13 @@ static void crypt_dtr(struct dm_target *ti)
 
 	bioset_exit(&cc->bs);
 
-	if (mempool_initialized(&cc->page_pool))
-		WARN_ON(percpu_counter_sum(&cc->n_allocated_pages) != 0);
-	percpu_counter_destroy(&cc->n_allocated_pages);
-
 	mempool_exit(&cc->page_pool);
 	mempool_exit(&cc->req_pool);
 	mempool_exit(&cc->tag_pool);
 
+	WARN_ON(percpu_counter_sum(&cc->n_allocated_pages) != 0);
+	percpu_counter_destroy(&cc->n_allocated_pages);
+
 	if (cc->iv_gen_ops && cc->iv_gen_ops->dtr)
 		cc->iv_gen_ops->dtr(cc);