evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging/lustre/ldlm: inline ldlm_proc_setup

Browse source 
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>
This commit is contained in:
Peng Tao 2013-12-03 22:42:01 +08:00 • committed by Greg Kroah-Hartman
parent 8cc420d057
commit 0396ec9e93
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/staging/lustre/lustre/include/lustre_dlm.h
View file

@ -1285,10 +1285,11 @@ void ldlm_namespace_register(struct ldlm_namespace *ns, ldlm_side_t client);
void ldlm_namespace_unregister(struct ldlm_namespace *ns, ldlm_side_t client); void ldlm_namespace_unregister(struct ldlm_namespace *ns, ldlm_side_t client);
void ldlm_namespace_get(struct ldlm_namespace *ns); void ldlm_namespace_get(struct ldlm_namespace *ns);
void ldlm_namespace_put(struct ldlm_namespace *ns); void ldlm_namespace_put(struct ldlm_namespace *ns);
int ldlm_proc_setup(void);
#ifdef LPROCFS #ifdef LPROCFS
int ldlm_proc_setup(void);
void ldlm_proc_cleanup(void); void ldlm_proc_cleanup(void);
#else #else
static inline int ldlm_proc_setup(void) { return 0; }
static inline void ldlm_proc_cleanup(void) {} static inline void ldlm_proc_cleanup(void) {}
#endif #endif

2
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
View file

@ -1012,11 +1012,9 @@ static int ldlm_setup(void)
if (ldlm_state == NULL) if (ldlm_state == NULL)
return -ENOMEM; return -ENOMEM;
#ifdef LPROCFS
rc = ldlm_proc_setup(); rc = ldlm_proc_setup();
if (rc != 0) if (rc != 0)
GOTO(out, rc); GOTO(out, rc);
#endif
memset(&conf, 0, sizeof(conf)); memset(&conf, 0, sizeof(conf));
conf = (typeof(conf)) { conf = (typeof(conf)) {