Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1236949

[PATCH 30/32] staging/lustre/ldlm: Remove ldlm_namespace_inactive_list()

Show all headers | View raw

From: Oleg Drokin <green@linuxhacker.ru>

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>
---
 drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 7 -------
 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 7 +++----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h
index e63a1c9..6cf3f9f 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h
@@ -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 ?
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
index de1b443..9152423 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
@@ -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. */
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/32] Lustre (mostly locking) unused code removal green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 21/32] staging/lustre/ldlm: Remove ldlm_refresh/del_waiting_lock() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 04/32] staging/lustre/llite: Remove unused ll_rmdir_entry() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 18/32] staging/lustre/ldlm: Remove ldlm_namespace_free() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 12/32] staging/lustre/ldlm: Remove unused ldlm_cli_enqueue_local() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 25/32] staging/lustre/ldlm: Remove unused ldlm_blocking_ast/_nocheck() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 06/32] staging/lustre/lov: Remove unused lov_lsm_decref() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 29/32] staging/lustre/ldlm: Remove unused exported symbols. green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 20/32] staging/lustre/ldlm: Remove unused ldlm_pool_set_slv() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 16/32] staging/lustre/ldlm: Remove ldlm_glimpse_ast() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 28/32] staging/lustre/ldlm: Remove server side code from pool support. green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 24/32] staging/lustre/ldlm: Remove unused ldlm_resource_insert_lock_after() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 19/32] staging/lustre/ldlm: Remove unused ldlm_pool_get_clv() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 30/32] staging/lustre/ldlm: Remove ldlm_namespace_inactive_list() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 05/32] staging/lustre/lov: Remove unused lov_dump_lmm/pool() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 02/32] staging/lustre: KEY_DEFAULT/MAX_COOKIESIZE key is unused, remove them green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 32/32] staging/lustre/ldlm: Make ldlm_add_ast_work_item() static green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 13/32] staging/lustre/ldlm: Remove unused ldlm_init/fini_flock_export green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 08/32] staging/lustre/ldlm: Remove unused ldlm_cancel_locks_for_exports() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 07/32] staging/lustre/ldlm: Remove unused interval tree bits green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 03/32] staging/lustre: Remove ununused ll_ra_read_get() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 14/32] staging/lustre/ldlm: Remove unused ldlm_enqueue_pack() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 26/32] staging/lustre: Remove ns_is_client() green@linuxhacker.ru - 2015-10-01 06:20 +0200
  [PATCH 11/32] staging/lustre/ldlm: Get rid of lr_converting queue green@linuxhacker.ru - 2015-10-01 06:30 +0200
  [PATCH 10/32] staging/lustre/ldlm: Remove unimplemented lock conversion traces. green@linuxhacker.ru - 2015-10-01 06:30 +0200

csiph-web