Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 372d5b56 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: fdedd945 ("staging/lustre/lvfs: remove the lvfs layer")
Cc: James Simmons <uja.ornl@gmail.com>
Cc: Mikhail Pershin <mike.pershin@intel.com>
Cc: John L. Hammond <john.hammond@intel.com>
Cc: Jian Yu <jian.yu@intel.com>
Cc: Bob Glossman <bob.glossman@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e31981a1

drivers/staging/lustre/lustre/obdclass/class_obd.c

+17 −14
Original line number Diff line number Diff line
@@ -534,9 +534,11 @@ static int __init init_obdclass(void) 
	spin_lock_init(&obd_types_lock);

	obd_zombie_impexp_init();



	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;
@@ -548,6 +550,7 @@ static int __init init_obdclass(void) 
		lprocfs_counter_init(obd_memory, OBD_MEMORY_PAGES_STAT,

				     LPROCFS_CNTR_AVGMINMAX,

				     "pagesused", "pages");

	}



	err = obd_init_checks();

	if (err == -EOVERFLOW)