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

Commit 8cc420d0 authored by Peng Tao's avatar Peng Tao Committed by Greg Kroah-Hartman
Browse files

staging/lustre/obdclass: lprocfs_{alloc_stats,register} always defined 



No need to surround them with #ifdef LPROCFS.

Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 52ee5b56

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

+2 −2
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static int __init init_obdclass(void) 


	spin_lock_init(&obd_types_lock);

	obd_zombie_impexp_init();

#ifdef LPROCFS



	obd_memory = lprocfs_alloc_stats(OBD_STATS_NUM,

					 LPROCFS_STATS_FLAG_NONE |

					 LPROCFS_STATS_FLAG_IRQ_SAFE);
@@ -531,7 +531,7 @@ static int __init init_obdclass(void) 
	lprocfs_counter_init(obd_memory, OBD_MEMORY_PAGES_STAT,

			     LPROCFS_CNTR_AVGMINMAX,

			     "pagesused", "pages");

#endif



	err = obd_init_checks();

	if (err == -EOVERFLOW)

		return err;

drivers/staging/lustre/lustre/obdclass/genops.c

+1 −2
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops, 
	strcpy(type->typ_name, name);

	spin_lock_init(&type->obd_type_lock);



#ifdef LPROCFS

	type->typ_procroot = lprocfs_register(type->typ_name, proc_lustre_root,

					      vars, type);

	if (IS_ERR(type->typ_procroot)) {
@@ -201,7 +200,7 @@ int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops, 
		type->typ_procroot = NULL;

		GOTO (failed, rc);

	}

#endif



	if (ldt != NULL) {

		type->typ_lu = ldt;

		rc = lu_device_type_init(ldt);