Commit 3818b4c8 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman

staging/lustre/ldlm: Remove unused lr_most_restr from struct ldlm_resource

This member comes from the dawn of time and is no longer needed
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c4e31588
...@@ -847,9 +847,6 @@ struct ldlm_resource { ...@@ -847,9 +847,6 @@ struct ldlm_resource {
struct list_head lr_waiting; struct list_head lr_waiting;
/** @} */ /** @} */
/* XXX No longer needed? Remove ASAP */
ldlm_mode_t lr_most_restr;
/** Type of locks this resource can hold. Only one type per resource. */ /** Type of locks this resource can hold. Only one type per resource. */
ldlm_type_t lr_type; /* LDLM_{PLAIN,EXTENT,FLOCK,IBITS} */ ldlm_type_t lr_type; /* LDLM_{PLAIN,EXTENT,FLOCK,IBITS} */
......
...@@ -1033,9 +1033,6 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list) ...@@ -1033,9 +1033,6 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list)
else else
ldlm_resource_add_lock(res, &res->lr_granted, lock); ldlm_resource_add_lock(res, &res->lr_granted, lock);
if (lock->l_granted_mode < res->lr_most_restr)
res->lr_most_restr = lock->l_granted_mode;
if (work_list && lock->l_completion_ast) if (work_list && lock->l_completion_ast)
ldlm_add_ast_work_item(lock, NULL, work_list); ldlm_add_ast_work_item(lock, NULL, work_list);
......
...@@ -1110,7 +1110,6 @@ ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent, ...@@ -1110,7 +1110,6 @@ ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent,
res->lr_ns_bucket = cfs_hash_bd_extra_get(ns->ns_rs_hash, &bd); res->lr_ns_bucket = cfs_hash_bd_extra_get(ns->ns_rs_hash, &bd);
res->lr_name = *name; res->lr_name = *name;
res->lr_type = type; res->lr_type = type;
res->lr_most_restr = LCK_NL;
cfs_hash_bd_lock(ns->ns_rs_hash, &bd, 1); cfs_hash_bd_lock(ns->ns_rs_hash, &bd, 1);
hnode = (version == cfs_hash_bd_version_get(&bd)) ? NULL : hnode = (version == cfs_hash_bd_version_get(&bd)) ? NULL :
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment