public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: merge module cleanup sequence to one helper

Browse source 
The module exit function exit_btrfs_fs() is duplicating a section of code
in init_btrfs_fs(). Add a helper to remove the duplicated code. Due
to the init/exit section requirements the function must be inline and
not a plain static as it could cause section mismatch.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain 2022-10-19 21:51:42 +05:30 • committed by David Sterba
parent 02bc392798
commit 82c0efd3cd
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
fs/btrfs/super.c
View file

@ -2837,7 +2837,7 @@ static const struct init_sequence mod_init_seq[] = {
static bool mod_init_result[ARRAY_SIZE(mod_init_seq)]; static bool mod_init_result[ARRAY_SIZE(mod_init_seq)];
static void __exit exit_btrfs_fs(void) static __always_inline void btrfs_exit_btrfs_fs(void)
{ {
int i; int i;
@ -2850,6 +2850,11 @@ static void __exit exit_btrfs_fs(void)
} }
} }
static void __exit exit_btrfs_fs(void)
{
btrfs_exit_btrfs_fs();
}
static int __init init_btrfs_fs(void) static int __init init_btrfs_fs(void)
{ {
int ret; int ret;
@ -2858,26 +2863,13 @@ static int __init init_btrfs_fs(void)
for (i = 0; i < ARRAY_SIZE(mod_init_seq); i++) { for (i = 0; i < ARRAY_SIZE(mod_init_seq); i++) {
ASSERT(!mod_init_result[i]); ASSERT(!mod_init_result[i]);
ret = mod_init_seq[i].init_func(); ret = mod_init_seq[i].init_func();
if (ret < 0) if (ret < 0) {
goto error; btrfs_exit_btrfs_fs();
return ret;
}
mod_init_result[i] = true; mod_init_result[i] = true;
} }
return 0; return 0;
error:
/*
* If we call exit_btrfs_fs() it would cause section mismatch.
* As init_btrfs_fs() belongs to .init.text, while exit_btrfs_fs()
* belongs to .exit.text.
*/
for (i = ARRAY_SIZE(mod_init_seq) - 1; i >= 0; i--) {
if (!mod_init_result[i])
continue;
if (mod_init_seq[i].exit_func)
mod_init_seq[i].exit_func();
mod_init_result[i] = false;
}
return ret;
} }
late_initcall(init_btrfs_fs); late_initcall(init_btrfs_fs);