leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging/lustre/ldlm: Remove ldlm_namespace_inactive_list()

Browse Source 
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: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oleg Drokin 2015-10-01 00:12:40 -04:00 committed by Greg Kroah-Hartman
parent 58c6d13377
commit 58ba1c313f
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/lustre/lustre/ldlm/ldlm_internal.h
View File

@ -42,7 +42,6 @@ extern struct mutex ldlm_srv_namespace_lock;
extern struct list_head ldlm_srv_namespace_list; extern struct list_head ldlm_srv_namespace_list;
extern struct mutex ldlm_cli_namespace_lock; extern struct mutex ldlm_cli_namespace_lock;
extern struct list_head ldlm_cli_active_namespace_list; 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) 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; &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) static inline struct mutex *ldlm_namespace_lock(ldlm_side_t client)
{ {
return client == LDLM_NAMESPACE_SERVER ? return client == LDLM_NAMESPACE_SERVER ?

7
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
View File

@ -59,7 +59,7 @@ struct mutex ldlm_cli_namespace_lock;
* inactive list */ * inactive list */
LIST_HEAD(ldlm_cli_active_namespace_list); LIST_HEAD(ldlm_cli_active_namespace_list);
/* Client namespaces that don't have any locks in them */ /* 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_debugfs_dir;
static struct dentry *ldlm_ns_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)); mutex_lock(ldlm_namespace_lock(client));
LASSERT(list_empty(&ns->ns_list_chain)); 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); ldlm_namespace_nr_inc(client);
mutex_unlock(ldlm_namespace_lock(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(!list_empty(&ns->ns_list_chain));
LASSERT(mutex_is_locked(ldlm_namespace_lock(client))); LASSERT(mutex_is_locked(ldlm_namespace_lock(client)));
list_move_tail(&ns->ns_list_chain, list_move_tail(&ns->ns_list_chain, &ldlm_cli_inactive_namespace_list);
ldlm_namespace_inactive_list(client));
} }
/** Should be called with ldlm_namespace_lock(client) taken. */ /** Should be called with ldlm_namespace_lock(client) taken. */