redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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

No need to surround them with #ifdef LPROCFS.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Peng Tao 2013-12-03 22:41:59 +08:00 committed by Greg Kroah-Hartman
parent 52ee5b567c
commit 8cc420d057
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/lustre/lustre/obdclass/class_obd.c
View File

@ -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;

3
drivers/staging/lustre/lustre/obdclass/genops.c
View File

@ -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);