ext4: use ext4_group_desc_free() in ext4_put_super() to save some duplicated code

[ Upstream commit 6ef684988816fdfa29ceff260c97d725a489a942 ]

The only difference here is that ->s_group_desc and ->s_flex_groups share
the same rcu read lock here but it is not necessary. In other places they
do not share the lock at all.

Signed-off-by: Jason Yan <yanaijie@huawei.com>
Link: https://lore.kernel.org/r/20230323140517.1070239-4-yanaijie@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Stable-dep-of: 496bb99b7e66 ("ext4: fix the might_sleep() warnings in kvfree()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 78986c3b125df18d9d5c3bae90f41f0277d5c145..9edaa79597a94ba8e719432f292b73b811aec2cf 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1236,11 +1236,23 @@ static void ext4_percpu_param_destroy(struct ext4_sb_info *sbi)
        percpu_free_rwsem(&sbi->s_writepages_rwsem);
 }
 
+static void ext4_group_desc_free(struct ext4_sb_info *sbi)
+{
+       struct buffer_head **group_desc;
+       int i;
+
+       rcu_read_lock();
+       group_desc = rcu_dereference(sbi->s_group_desc);
+       for (i = 0; i < sbi->s_gdb_count; i++)
+               brelse(group_desc[i]);
+       kvfree(group_desc);
+       rcu_read_unlock();
+}
+
 static void ext4_put_super(struct super_block *sb)
 {
        struct ext4_sb_info *sbi = EXT4_SB(sb);
        struct ext4_super_block *es = sbi->s_es;
-       struct buffer_head **group_desc;
        struct flex_groups **flex_groups;
        int aborted = 0;
        int i, err;
@@ -1290,11 +1302,8 @@ static void ext4_put_super(struct super_block *sb)
        if (!sb_rdonly(sb))
                ext4_commit_super(sb);
 
+       ext4_group_desc_free(sbi);
        rcu_read_lock();
-       group_desc = rcu_dereference(sbi->s_group_desc);
-       for (i = 0; i < sbi->s_gdb_count; i++)
-               brelse(group_desc[i]);
-       kvfree(group_desc);
        flex_groups = rcu_dereference(sbi->s_flex_groups);
        if (flex_groups) {
                for (i = 0; i < sbi->s_flex_groups_allocated; i++)
@@ -4770,19 +4779,6 @@ static int ext4_geometry_check(struct super_block *sb,
        return 0;
 }
 
-static void ext4_group_desc_free(struct ext4_sb_info *sbi)
-{
-       struct buffer_head **group_desc;
-       int i;
-
-       rcu_read_lock();
-       group_desc = rcu_dereference(sbi->s_group_desc);
-       for (i = 0; i < sbi->s_gdb_count; i++)
-               brelse(group_desc[i]);
-       kvfree(group_desc);
-       rcu_read_unlock();
-}
-
 static int ext4_group_desc_init(struct super_block *sb,
                                struct ext4_super_block *es,
                                ext4_fsblk_t logical_sb_block,