staging/lustre/lvfs: fix building without CONFIG_PROC_FS
PATCH 1/1 staging/lustre/lvfs: fix building without CONFIG_PROC_FS
Patch "staging/lustre/lvfs: remove the lvfs layer" moved some code around that was previously only built when CONFIG_PROC_FS was set, which now causes an invalid access to the obd_memory variable:
ERROR: "obd_memory" [drivers/staging/lustre/lustre/obdclass/obdclass.ko] undefined!
This fixes it by using adding a compile-time check around the access.
Signed-off-by Arnd Bergmann <[email protected]>
Fixes fdedd94509fd ("staging/lustre/lvfs: remove the lvfs layer")
Cc James Simmons <[email protected]>
Cc Mikhail Pershin <[email protected]>
Cc John L. Hammond <[email protected]>
Cc Jian Yu <[email protected]>
Cc Bob Glossman <[email protected]>
Cc Oleg Drokin <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
drivers/staging/lustre/lustre/obdclass/class_obd.c +17 -14
@@ -534,20 +534,23 @@ static int __init init_obdclass(void)spin_lock_init (&obd_types_lock);obd_zombie_impexp_init (); - obd_memory =lprocfs_alloc_stats (OBD_STATS_NUM , -LPROCFS_STATS_FLAG_NONE | -LPROCFS_STATS_FLAG_IRQ_SAFE ); -if (obd_memory ==NULL ) { -CERROR ("kmalloc of 'obd_memory' failed\n" ); -return -ENOMEM ; - } - -lprocfs_counter_init (obd_memory,OBD_MEMORY_STAT , -LPROCFS_CNTR_AVGMINMAX , -"memused" ,"bytes" ); -lprocfs_counter_init (obd_memory,OBD_MEMORY_PAGES_STAT , -LPROCFS_CNTR_AVGMINMAX , -"pagesused" ,"pages" ); +if (IS_ENABLED (CONFIG_PROC_FS )) { + obd_memory =lprocfs_alloc_stats (OBD_STATS_NUM , +LPROCFS_STATS_FLAG_NONE | +LPROCFS_STATS_FLAG_IRQ_SAFE ); + +if (obd_memory ==NULL ) { +CERROR ("kmalloc of 'obd_memory' failed\n" ); +return -ENOMEM ; + } + +lprocfs_counter_init (obd_memory,OBD_MEMORY_STAT , +LPROCFS_CNTR_AVGMINMAX , +"memused" ,"bytes" ); +lprocfs_counter_init (obd_memory,OBD_MEMORY_PAGES_STAT , +LPROCFS_CNTR_AVGMINMAX , +"pagesused" ,"pages" ); + } err =obd_init_checks ();if (err == -EOVERFLOW )