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

Commit 0396ec9e authored by Peng Tao's avatar Peng Tao Committed by Greg Kroah-Hartman
Browse files

staging/lustre/ldlm: inline ldlm_proc_setup 



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 8cc420d0

drivers/staging/lustre/lustre/include/lustre_dlm.h

+2 −1
Original line number Diff line number Diff line
@@ -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_get(struct ldlm_namespace *ns);

void ldlm_namespace_put(struct ldlm_namespace *ns);

int ldlm_proc_setup(void);

#ifdef LPROCFS

int ldlm_proc_setup(void);

void ldlm_proc_cleanup(void);

#else

static inline int ldlm_proc_setup(void) { return 0; }

static inline void ldlm_proc_cleanup(void) {}

#endif

drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c

+0 −2
Original line number Diff line number Diff line
@@ -1012,11 +1012,9 @@ static int ldlm_setup(void) 
	if (ldlm_state == NULL)

		return -ENOMEM;



#ifdef LPROCFS

	rc = ldlm_proc_setup();

	if (rc != 0)

		GOTO(out, rc);

#endif



	memset(&conf, 0, sizeof(conf));

	conf = (typeof(conf)) {