Skip to contentSkip to conversation

md/raid5: simplify uninitialization of shrinker

PATCH Applied Aliaksei Karaliou 2 participants 2 messages Dec 23, 2017 – Feb 17, 2018 MD RAID

lore
Share & tools
lore

Aliaksei Karaliou

author
#0 lore raw

PATCH 1/1 md/raid5: simplify uninitialization of shrinker

Don't use shrinker.nr_deferred to check whether shrinker was initialized or not. Now this check was integrated into unregister_shrinker(), so it is safe to call it against unregistered shrinker.

Signed-off-by Aliaksei Karaliou <[email protected]>
---
 drivers/md/raid5.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/md/raid5.c +1 -3
index 5a2a29bd02dd..8f985831b832 100644
@@ -6764,9 +6764,7 @@ static void free_conf(struct r5conf *conf)
 
 	log_exit(conf);
 
-	if (conf->shrinker.nr_deferred)
-		unregister_shrinker(&conf->shrinker);
-
+	unregister_shrinker(&conf->shrinker);
 	free_thread_groups(conf);
 	shrink_stripes(conf);
 	raid5_free_percpu(conf);
Signature · 1 line
2.11.0
Applied
#1 lore raw
Quoted 6 lines · Aliaksei Karaliou

Don't use shrinker.nr_deferred to check whether shrinker was initialized or not. Now this check was integrated into unregister_shrinker(), so it is safe to call it against unregistered shrinker.

Signed-off-by Aliaksei Karaliou <[email protected]>

applied, thanks!

Quoted 22 lines
---
 drivers/md/raid5.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/md/raid5.c +1 -3
index 5a2a29bd02dd..8f985831b832 100644
@@ -6764,9 +6764,7 @@ static void free_conf(struct r5conf *conf)
 
 	log_exit(conf);
 
-	if (conf->shrinker.nr_deferred)
-		unregister_shrinker(&conf->shrinker);
-
+	unregister_shrinker(&conf->shrinker);
 	free_thread_groups(conf);
 	shrink_stripes(conf);
 	raid5_free_percpu(conf);
Signature · 1 line
2.11.0