* [PATCH] staging: lustre: fix undefined references to obd_memory
@ 2014-09-15 14:34 John L. Hammond
2014-09-19 23:10 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: John L. Hammond @ 2014-09-15 14:34 UTC (permalink / raw)
To: greg, andreas.dilger, oleg.drokin; +Cc: uja.ornl, linux-kernel, John L. Hammond
From: "John L. Hammond" <john.hammond@intel.com>
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 <john.hammond@intel.com>
---
.../staging/lustre/lustre/include/obd_support.h | 2 ++
drivers/staging/lustre/lustre/obdclass/class_obd.c | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h
index 2991d2e..408ce7f 100644
--- a/drivers/staging/lustre/lustre/include/obd_support.h
+++ b/drivers/staging/lustre/lustre/include/obd_support.h
@@ -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;
diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
index 8b8d338..2939f0c 100644
--- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
+++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
@@ -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);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] staging: lustre: fix undefined references to obd_memory
2014-09-15 14:34 [PATCH] staging: lustre: fix undefined references to obd_memory John L. Hammond
@ 2014-09-19 23:10 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2014-09-19 23:10 UTC (permalink / raw)
To: John L. Hammond; +Cc: andreas.dilger, oleg.drokin, uja.ornl, linux-kernel
On Mon, Sep 15, 2014 at 09:34:53AM -0500, John L. Hammond wrote:
> From: "John L. Hammond" <john.hammond@intel.com>
>
> 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 <john.hammond@intel.com>
> ---
> .../staging/lustre/lustre/include/obd_support.h | 2 ++
> drivers/staging/lustre/lustre/obdclass/class_obd.c | 5 +++++
> 2 files changed, 7 insertions(+)
>
> diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h
> index 2991d2e..408ce7f 100644
> --- a/drivers/staging/lustre/lustre/include/obd_support.h
> +++ b/drivers/staging/lustre/lustre/include/obd_support.h
> @@ -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;
> diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c
> index 8b8d338..2939f0c 100644
> --- a/drivers/staging/lustre/lustre/obdclass/class_obd.c
> +++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c
> @@ -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 */
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-09-19 23:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-15 14:34 [PATCH] staging: lustre: fix undefined references to obd_memory John L. Hammond
2014-09-19 23:10 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.