Commit 58ba1c31 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/ldlm: Remove ldlm_namespace_inactive_list() 



Since there are no server namespaces, just replace it with
ldlm_cli_inactive_namespace_list pointer.
Also make ldlm_cli_inactive_namespace_list static as it's only
used in ldlm_resource.c

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 58c6d133

drivers/staging/lustre/lustre/ldlm/ldlm_internal.h

+0 −7
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ extern struct mutex ldlm_srv_namespace_lock; 
extern struct list_head ldlm_srv_namespace_list;

extern struct mutex ldlm_cli_namespace_lock;

extern struct list_head ldlm_cli_active_namespace_list;

extern struct list_head ldlm_cli_inactive_namespace_list;



static inline int ldlm_namespace_nr_read(ldlm_side_t client)

{
@@ -72,12 +71,6 @@ static inline struct list_head *ldlm_namespace_list(ldlm_side_t client) 
		&ldlm_srv_namespace_list : &ldlm_cli_active_namespace_list;

}



static inline struct list_head *ldlm_namespace_inactive_list(ldlm_side_t client)

{

	return client == LDLM_NAMESPACE_SERVER ?

		&ldlm_srv_namespace_list : &ldlm_cli_inactive_namespace_list;

}



static inline struct mutex *ldlm_namespace_lock(ldlm_side_t client)

{

	return client == LDLM_NAMESPACE_SERVER ?

drivers/staging/lustre/lustre/ldlm/ldlm_resource.c

+3 −4
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct mutex ldlm_cli_namespace_lock; 
 * inactive list */

LIST_HEAD(ldlm_cli_active_namespace_list);

/* Client namespaces that don't have any locks in them */

LIST_HEAD(ldlm_cli_inactive_namespace_list);

static LIST_HEAD(ldlm_cli_inactive_namespace_list);



static struct dentry *ldlm_debugfs_dir;

static struct dentry *ldlm_ns_debugfs_dir;
@@ -609,7 +609,7 @@ static void ldlm_namespace_register(struct ldlm_namespace *ns, 
{

	mutex_lock(ldlm_namespace_lock(client));

	LASSERT(list_empty(&ns->ns_list_chain));

	list_add(&ns->ns_list_chain, ldlm_namespace_inactive_list(client));

	list_add(&ns->ns_list_chain, &ldlm_cli_inactive_namespace_list);

	ldlm_namespace_nr_inc(client);

	mutex_unlock(ldlm_namespace_lock(client));

}
@@ -1011,8 +1011,7 @@ void ldlm_namespace_move_to_inactive_locked(struct ldlm_namespace *ns, 
{

	LASSERT(!list_empty(&ns->ns_list_chain));

	LASSERT(mutex_is_locked(ldlm_namespace_lock(client)));

	list_move_tail(&ns->ns_list_chain,

		       ldlm_namespace_inactive_list(client));

	list_move_tail(&ns->ns_list_chain, &ldlm_cli_inactive_namespace_list);

}



/** Should be called with ldlm_namespace_lock(client) taken. */