staging: lustre: remove unused hash tables. (3eb9d961) · Commits · 戴 / test

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -629,16 +629,6 @@ struct ldlm_lock {
		* Tree node for ldlm_extent.
		*/
		struct ldlm_interval *l_tree_node;
		/**
		* Per export hash of locks.
		* Protected by per-bucket exp->exp_lock_hash locks.
		*/
		struct hlist_node l_exp_hash;
		/**
		* Per export hash of flock locks.
		* Protected by per-bucket exp->exp_flock_hash locks.
		*/
		struct hlist_node l_exp_flock_hash;
		/**
		* Requested mode.
		* Protected by lr_lock.

+0 −7

Original line number	Diff line number	Diff line
		@@ -102,13 +102,6 @@ struct obd_export {
		struct ptlrpc_connection *exp_connection;
		/** Connection count value from last successful reconnect rpc */
		__u32 exp_conn_cnt;
		/** Hash list of all ldlm locks granted on this export */
		struct cfs_hash *exp_lock_hash;
		/**
		* Hash list for Posix lock deadlock detection, added with
		* ldlm_lock::l_exp_flock_hash.
		*/
		struct cfs_hash *exp_flock_hash;
		struct list_head exp_outstanding_replies;
		struct list_head exp_uncommitted_replies;
		spinlock_t exp_uncommitted_replies_lock;

+0 −18

Original line number	Diff line number	Diff line
		@@ -67,27 +67,9 @@ extern char obd_jobid_var[];
		#define HASH_UUID_BKT_BITS 5
		#define HASH_UUID_CUR_BITS 7
		#define HASH_UUID_MAX_BITS 12
		#define HASH_NID_BKT_BITS 5
		#define HASH_NID_CUR_BITS 7
		#define HASH_NID_MAX_BITS 12
		#define HASH_NID_STATS_BKT_BITS 5
		#define HASH_NID_STATS_CUR_BITS 7
		#define HASH_NID_STATS_MAX_BITS 12
		#define HASH_LQE_BKT_BITS 5
		#define HASH_LQE_CUR_BITS 7
		#define HASH_LQE_MAX_BITS 12
		#define HASH_CONN_BKT_BITS 5
		#define HASH_CONN_CUR_BITS 5
		#define HASH_CONN_MAX_BITS 15
		#define HASH_EXP_LOCK_BKT_BITS 5
		#define HASH_EXP_LOCK_CUR_BITS 7
		#define HASH_EXP_LOCK_MAX_BITS 16
		#define HASH_CL_ENV_BKT_BITS 5
		#define HASH_CL_ENV_BITS 10
		#define HASH_JOB_STATS_BKT_BITS 5
		#define HASH_JOB_STATS_CUR_BITS 7
		#define HASH_JOB_STATS_MAX_BITS 12

		/* Timeout definitions */
		#define OBD_TIMEOUT_DEFAULT 100
		/* Time to wait for all clients to reconnect during recovery (hard limit) */

+1 −10

Original line number	Diff line number	Diff line
		@@ -83,9 +83,6 @@ ldlm_flock_destroy(struct ldlm_lock *lock, enum ldlm_mode mode)
		LDLM_DEBUG(lock, "%s(mode: %d)",
		__func__, mode);

		/* Safe to not lock here, since it should be empty anyway */
		LASSERT(hlist_unhashed(&lock->l_exp_flock_hash));

		list_del_init(&lock->l_res_link);

		/* client side - set a flag to prevent sending a CANCEL */
		@@ -263,15 +260,9 @@ reprocess:
		lock->l_policy_data.l_flock.start =
		new->l_policy_data.l_flock.end + 1;
		new2->l_conn_export = lock->l_conn_export;
		if (lock->l_export) {
		if (lock->l_export)
		new2->l_export = class_export_lock_get(lock->l_export,
		new2);
		if (new2->l_export->exp_lock_hash &&
		hlist_unhashed(&new2->l_exp_hash))
		cfs_hash_add(new2->l_export->exp_lock_hash,
		&new2->l_remote_handle,
		&new2->l_exp_hash);
		}
		ldlm_lock_addref_internal_nolock(new2,
		lock->l_granted_mode);

+0 −14

Original line number	Diff line number	Diff line
		@@ -318,18 +318,6 @@ static int ldlm_lock_destroy_internal(struct ldlm_lock *lock)
		}
		ldlm_set_destroyed(lock);

		if (lock->l_export && lock->l_export->exp_lock_hash) {
		/* NB: it's safe to call cfs_hash_del() even lock isn't
		* in exp_lock_hash.
		*/
		/* In the function below, .hs_keycmp resolves to
		* ldlm_export_lock_keycmp()
		*/
		/* coverity[overrun-buffer-val] */
		cfs_hash_del(lock->l_export->exp_lock_hash,
		&lock->l_remote_handle, &lock->l_exp_hash);
		}

		ldlm_lock_remove_from_lru(lock);
		class_handle_unhash(&lock->l_handle);

		@@ -419,8 +407,6 @@ static struct ldlm_lock ldlm_lock_new(struct ldlm_resource resource)
		lock->l_blocking_lock = NULL;
		INIT_LIST_HEAD(&lock->l_sl_mode);
		INIT_LIST_HEAD(&lock->l_sl_policy);
		INIT_HLIST_NODE(&lock->l_exp_hash);
		INIT_HLIST_NODE(&lock->l_exp_flock_hash);

		lprocfs_counter_incr(ldlm_res_to_ns(resource)->ns_stats,
		LDLM_NSS_LOCKS);