Commit 8868dc0d authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre/ldlm: Remove ldlm_refresh/del_waiting_lock() 



Nothing adds locks into waiting list on the client, so no
point in retaining those.

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a5613d75

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

+0 −2
Original line number Diff line number Diff line
@@ -1108,8 +1108,6 @@ struct ldlm_callback_suite { 
};



/* ldlm_lockd.c */

int ldlm_del_waiting_lock(struct ldlm_lock *lock);

int ldlm_refresh_waiting_lock(struct ldlm_lock *lock, int timeout);

int ldlm_get_ref(void);

void ldlm_put_ref(void);

struct ldlm_lock *ldlm_request_lock(struct ptlrpc_request *req);

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

+0 −8
Original line number Diff line number Diff line
@@ -1947,17 +1947,9 @@ void ldlm_lock_cancel(struct ldlm_lock *lock) 
		LBUG();

	}



	if (lock->l_flags & LDLM_FL_WAITED)

		ldlm_del_waiting_lock(lock);



	/* Releases cancel callback. */

	ldlm_cancel_callback(lock);



	/* Yes, second time, just in case it was added again while we were

	 * running with no res lock in ldlm_cancel_callback */

	if (lock->l_flags & LDLM_FL_WAITED)

		ldlm_del_waiting_lock(lock);



	ldlm_resource_unlink_lock(lock);

	ldlm_lock_destroy_nolock(lock);

drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c

+0 −13
Original line number Diff line number Diff line
@@ -111,19 +111,6 @@ struct ldlm_bl_work_item { 
	int		     blwi_mem_pressure;

};





int ldlm_del_waiting_lock(struct ldlm_lock *lock)

{

	return 0;

}



int ldlm_refresh_waiting_lock(struct ldlm_lock *lock, int timeout)

{

	return 0;

}







/**

 * Callback handler for receiving incoming blocking ASTs.

 *