Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

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

+0 −3
Original line number Diff line number Diff line
@@ -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} */

drivers/staging/lustre/lustre/ldlm/ldlm_lock.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

drivers/staging/lustre/lustre/ldlm/ldlm_resource.c

+0 −1
Original line number Diff line number Diff line
@@ -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 :