staging: lustre: fix undefined references to obd_memory
PATCH 1/1 staging: lustre: fix undefined references to obd_memory
From: "John L. Hammond" <[email protected]>
If CONFIG_PROC_FS=n then obd_memory is not defined. So put the setup and cleanup of this variable within #ifdef CONFIG_PROC_FS guards.
Signed-off-by John L. Hammond <[email protected]>
--- .../staging/lustre/lustre/include/obd_support.h | 2 ++ drivers/staging/lustre/lustre/obdclass/class_obd.c | 5 +++++ 2 files changed, 7 insertions(+)
drivers/staging/lustre/lustre/include/obd_support.h +2 -0
@@ -43,12 +43,14 @@#include "lprocfs_status.h" /* global variables */ +#ifdef CONFIG_PROC_FS extern struct lprocfs_stats *obd_memory;enum {OBD_MEMORY_STAT =0 ,OBD_MEMORY_PAGES_STAT =1 ,OBD_STATS_NUM , }; +#endif /* CONFIG_PROC_FS */ extern unsigned int obd_debug_peer_on_timeout;extern unsigned int obd_dump_on_timeout;
drivers/staging/lustre/lustre/obdclass/class_obd.c +5 -0
@@ -534,6 +534,7 @@ static int __init init_obdclass(void)spin_lock_init (&obd_types_lock);obd_zombie_impexp_init (); +#ifdef CONFIG_PROC_FS obd_memory =lprocfs_alloc_stats (OBD_STATS_NUM ,LPROCFS_STATS_FLAG_NONE |LPROCFS_STATS_FLAG_IRQ_SAFE );
@@ -548,6 +549,7 @@ static int __init init_obdclass(void)lprocfs_counter_init (obd_memory,OBD_MEMORY_PAGES_STAT ,LPROCFS_CNTR_AVGMINMAX ,"pagesused" ,"pages" ); +#endif /* CONFIG_PROC_FS */ err =obd_init_checks ();if (err == -EOVERFLOW )
@@ -688,7 +690,10 @@ static void cleanup_obdclass(void) memory_max =obd_memory_max (); pages_max =obd_pages_max (); +#ifdef CONFIG_PROC_FS lprocfs_free_stats (&obd_memory); +#endif /* CONFIG_PROC_FS */ +CDEBUG ((memory_leaked) ?D_ERROR :D_INFO ,"obd_memory max: %llu, leaked: %llu\n" , memory_max, memory_leaked);
Signature · 1 line
1.7.9.5
Quoted 51 lines · John L. Hammond
From: "John L. Hammond" <[email protected]>
If
CONFIG_PROC_FS=nthenobd_memoryis not defined. So put the setup and cleanup of this variable within #ifdefCONFIG_PROC_FSguards.Signed-off-by John L. Hammond <[email protected]>--- .../staging/lustre/lustre/include/obd_support.h | 2 ++ drivers/staging/lustre/lustre/obdclass/class_obd.c | 5 +++++ 2 files changed, 7 insertions(+)drivers/staging/lustre/lustre/include/obd_support.h +2
-0@@ -43,12 +43,14 @@#include "lprocfs_status.h" /* global variables */ +#ifdef CONFIG_PROC_FS extern struct lprocfs_stats *obd_memory;enum {OBD_MEMORY_STAT =0 ,OBD_MEMORY_PAGES_STAT =1 ,OBD_STATS_NUM , }; +#endif /* CONFIG_PROC_FS */ extern unsigned int obd_debug_peer_on_timeout;extern unsigned int obd_dump_on_timeout;drivers/staging/lustre/lustre/obdclass/class_obd.c +2
-0@@ -534,6 +534,7 @@ static int __init init_obdclass(void)spin_lock_init (&obd_types_lock);obd_zombie_impexp_init (); +#ifdef CONFIG_PROC_FS obd_memory =lprocfs_alloc_stats (OBD_STATS_NUM ,LPROCFS_STATS_FLAG_NONE |LPROCFS_STATS_FLAG_IRQ_SAFE );@@ -548,6 +549,7 @@ static int __init init_obdclass(void)lprocfs_counter_init (obd_memory,OBD_MEMORY_PAGES_STAT ,LPROCFS_CNTR_AVGMINMAX ,"pagesused" ,"pages" ); +#endif /* CONFIG_PROC_FS */ err =obd_init_checks ();if (err == -EOVERFLOW )
drivers/staging/lustre/lustre/obdclass/class_obd.c static void cleanup_obdclass(void) · line 695
Quoted 6 lines
drivers/staging/lustre/lustre/obdclass/class_obd.c +2
-0@@ -688,7 +690,10 @@ static void cleanup_obdclass(void) memory_max =obd_memory_max (); pages_max =obd_pages_max (); +#ifdef CONFIG_PROC_FS lprocfs_free_stats (&obd_memory); +#endif /* CONFIG_PROC_FS */
That's horrid.
Don't put #ifdef lines in .c files, put the proper stuff in the .h files, that way there is always a lprocfs_free_stats call.
thanks,
greg k-h