aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

xfs: remove CPU hotplug infrastructure

Browse Source 
There are no users of the cpu hotplug hooks in xfs now, so remove it.
This reverts f1653c2e28 ("xfs: introduce CPU hotplug
infrastructure").

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
This commit is contained in:
Darrick J. Wong
2023-09-11 08:39:04 -07:00
parent f5bfa695f0
commit ef7d959339
2 changed files with 1 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
fs/xfs/xfs_super.c
View File

@@ -2294,39 +2294,6 @@ xfs_destroy_workqueues(void)
destroy_workqueue(xfs_alloc_wq); destroy_workqueue(xfs_alloc_wq);
} }
#ifdef CONFIG_HOTPLUG_CPU
static int
xfs_cpu_dead(
unsigned int cpu)
{
return 0;
}
static int __init
xfs_cpu_hotplug_init(void)
{
int error;
error = cpuhp_setup_state_nocalls(CPUHP_XFS_DEAD, "xfs:dead", NULL,
xfs_cpu_dead);
if (error < 0)
xfs_alert(NULL,
"Failed to initialise CPU hotplug, error %d. XFS is non-functional.",
error);
return error;
}
static void
xfs_cpu_hotplug_destroy(void)
{
cpuhp_remove_state_nocalls(CPUHP_XFS_DEAD);
}
#else /* !CONFIG_HOTPLUG_CPU */
static inline int xfs_cpu_hotplug_init(void) { return 0; }
static inline void xfs_cpu_hotplug_destroy(void) {}
#endif
STATIC int __init STATIC int __init
init_xfs_fs(void) init_xfs_fs(void)
{ {
@@ -2343,13 +2310,9 @@ init_xfs_fs(void)
xfs_dir_startup(); xfs_dir_startup();
error = xfs_cpu_hotplug_init();
if (error)
goto out;
error = xfs_init_caches(); error = xfs_init_caches();
if (error) if (error)
goto out_destroy_hp; goto out;
error = xfs_init_workqueues(); error = xfs_init_workqueues();
if (error) if (error)
@@ -2433,8 +2396,6 @@ init_xfs_fs(void)
xfs_destroy_workqueues(); xfs_destroy_workqueues();
out_destroy_caches: out_destroy_caches:
xfs_destroy_caches(); xfs_destroy_caches();
out_destroy_hp:
xfs_cpu_hotplug_destroy();
out: out:
return error; return error;
} }
@@ -2458,7 +2419,6 @@ exit_xfs_fs(void)
xfs_destroy_workqueues(); xfs_destroy_workqueues();
xfs_destroy_caches(); xfs_destroy_caches();
xfs_uuid_table_free(); xfs_uuid_table_free();
xfs_cpu_hotplug_destroy();
} }
module_init(init_xfs_fs); module_init(init_xfs_fs);

1
include/linux/cpuhotplug.h
View File

@@ -90,7 +90,6 @@ enum cpuhp_state {
CPUHP_FS_BUFF_DEAD, CPUHP_FS_BUFF_DEAD,
CPUHP_PRINTK_DEAD, CPUHP_PRINTK_DEAD,
CPUHP_MM_MEMCQ_DEAD, CPUHP_MM_MEMCQ_DEAD,
CPUHP_XFS_DEAD,
CPUHP_PERCPU_CNT_DEAD, CPUHP_PERCPU_CNT_DEAD,
CPUHP_RADIX_DEAD, CPUHP_RADIX_DEAD,
CPUHP_PAGE_ALLOC, CPUHP_PAGE_ALLOC,