From 372d5b5607074dc8fa6c495f56a4ae3e9a300f79 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 29 Sep 2014 14:47:45 +0200 Subject: [PATCH] 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 Fixes: fdedd94509fd ("staging/lustre/lvfs: remove the lvfs layer") Cc: James Simmons Cc: Mikhail Pershin Cc: John L. Hammond Cc: Jian Yu Cc: Bob Glossman Cc: Oleg Drokin Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- .../lustre/lustre/obdclass/class_obd.c | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/drivers/staging/lustre/lustre/obdclass/class_obd.c b/drivers/staging/lustre/lustre/obdclass/class_obd.c index 8b8d338e41e8..7265ecbc6f9d 100644 --- a/drivers/staging/lustre/lustre/obdclass/class_obd.c +++ b/drivers/staging/lustre/lustre/obdclass/class_obd.c @@ -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) -- 2.20.1