Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xfs: remove CPU hotplug infrastructure

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

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

+1 -42
+1 -41
fs/xfs/xfs_super.c
··· 2294 2294 destroy_workqueue(xfs_alloc_wq); 2295 2295 } 2296 2296 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 - 2330 2297 STATIC int __init 2331 2298 init_xfs_fs(void) 2332 2299 { ··· 2310 2343 2311 2344 xfs_dir_startup(); 2312 2345 2313 - error = xfs_cpu_hotplug_init(); 2314 - if (error) 2315 - goto out; 2316 - 2317 2346 error = xfs_init_caches(); 2318 2347 if (error) 2319 - goto out_destroy_hp; 2348 + goto out; 2320 2349 2321 2350 error = xfs_init_workqueues(); 2322 2351 if (error) ··· 2396 2433 xfs_destroy_workqueues(); 2397 2434 out_destroy_caches: 2398 2435 xfs_destroy_caches(); 2399 - out_destroy_hp: 2400 - xfs_cpu_hotplug_destroy(); 2401 2436 out: 2402 2437 return error; 2403 2438 } ··· 2419 2458 xfs_destroy_workqueues(); 2420 2459 xfs_destroy_caches(); 2421 2460 xfs_uuid_table_free(); 2422 - xfs_cpu_hotplug_destroy(); 2423 2461 } 2424 2462 2425 2463 module_init(init_xfs_fs);
-1
include/linux/cpuhotplug.h
··· 90 90 CPUHP_FS_BUFF_DEAD, 91 91 CPUHP_PRINTK_DEAD, 92 92 CPUHP_MM_MEMCQ_DEAD, 93 - CPUHP_XFS_DEAD, 94 93 CPUHP_PERCPU_CNT_DEAD, 95 94 CPUHP_RADIX_DEAD, 96 95 CPUHP_PAGE_ALLOC,