Skip to content

Commit ef7d959

Browse files
author
Darrick J. Wong
committed
xfs: remove CPU hotplug infrastructure
There are no users of the cpu hotplug hooks in xfs now, so remove it. This reverts f1653c2 ("xfs: introduce CPU hotplug infrastructure"). Signed-off-by: Darrick J. Wong <[email protected]> Reviewed-by: Dave Chinner <[email protected]>
1 parent f5bfa69 commit ef7d959

File tree

2 files changed

+1
-42
lines changed

2 files changed

+1
-42
lines changed

fs/xfs/xfs_super.c

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2294,39 +2294,6 @@ xfs_destroy_workqueues(void)
22942294
destroy_workqueue(xfs_alloc_wq);
22952295
}
22962296

2297-
#ifdef CONFIG_HOTPLUG_CPU
2298-
static int
2299-
xfs_cpu_dead(
2300-
unsigned int cpu)
2301-
{
2302-
return 0;
2303-
}
2304-
2305-
static int __init
2306-
xfs_cpu_hotplug_init(void)
2307-
{
2308-
int error;
2309-
2310-
error = cpuhp_setup_state_nocalls(CPUHP_XFS_DEAD, "xfs:dead", NULL,
2311-
xfs_cpu_dead);
2312-
if (error < 0)
2313-
xfs_alert(NULL,
2314-
"Failed to initialise CPU hotplug, error %d. XFS is non-functional.",
2315-
error);
2316-
return error;
2317-
}
2318-
2319-
static void
2320-
xfs_cpu_hotplug_destroy(void)
2321-
{
2322-
cpuhp_remove_state_nocalls(CPUHP_XFS_DEAD);
2323-
}
2324-
2325-
#else /* !CONFIG_HOTPLUG_CPU */
2326-
static inline int xfs_cpu_hotplug_init(void) { return 0; }
2327-
static inline void xfs_cpu_hotplug_destroy(void) {}
2328-
#endif
2329-
23302297
STATIC int __init
23312298
init_xfs_fs(void)
23322299
{
@@ -2343,13 +2310,9 @@ init_xfs_fs(void)
23432310

23442311
xfs_dir_startup();
23452312

2346-
error = xfs_cpu_hotplug_init();
2347-
if (error)
2348-
goto out;
2349-
23502313
error = xfs_init_caches();
23512314
if (error)
2352-
goto out_destroy_hp;
2315+
goto out;
23532316

23542317
error = xfs_init_workqueues();
23552318
if (error)
@@ -2433,8 +2396,6 @@ init_xfs_fs(void)
24332396
xfs_destroy_workqueues();
24342397
out_destroy_caches:
24352398
xfs_destroy_caches();
2436-
out_destroy_hp:
2437-
xfs_cpu_hotplug_destroy();
24382399
out:
24392400
return error;
24402401
}
@@ -2458,7 +2419,6 @@ exit_xfs_fs(void)
24582419
xfs_destroy_workqueues();
24592420
xfs_destroy_caches();
24602421
xfs_uuid_table_free();
2461-
xfs_cpu_hotplug_destroy();
24622422
}
24632423

24642424
module_init(init_xfs_fs);

include/linux/cpuhotplug.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ enum cpuhp_state {
9090
CPUHP_FS_BUFF_DEAD,
9191
CPUHP_PRINTK_DEAD,
9292
CPUHP_MM_MEMCQ_DEAD,
93-
CPUHP_XFS_DEAD,
9493
CPUHP_PERCPU_CNT_DEAD,
9594
CPUHP_RADIX_DEAD,
9695
CPUHP_PAGE_ALLOC,

0 commit comments

Comments
 (0)