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: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
index 51f416dd54d894c0ffd3fa7e2534e7c9d910b11a..4aeaac9ffeff2f2e1728e0109c2809aa42a8fd89 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
@@ -847,9 +847,6 @@ struct ldlm_resource {
        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. */
        ldlm_type_t             lr_type; /* LDLM_{PLAIN,EXTENT,FLOCK,IBITS} */
 

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
index 4fd735f00b957147d5726fffe804a74a1ec8b5d4..8f7513997d9061f2a3fe1f58f0cbe08ac9b0152e 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
@@ -1033,9 +1033,6 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list)
        else
                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)
                ldlm_add_ast_work_item(lock, NULL, work_list);
 

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
index 6ae8c605c0e7e18069b1f4b3672fe9edb8cd4497..fede1850c3716bb21d67b86977b21394a7d16e0c 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
@@ -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_name       = *name;
        res->lr_type       = type;
-       res->lr_most_restr = LCK_NL;
 
        cfs_hash_bd_lock(ns->ns_rs_hash, &bd, 1);
        hnode = (version == cfs_hash_bd_version_get(&bd)) ?  NULL :