leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oleg Drokin 2015-10-01 00:12:31 -04:00 committed by Greg Kroah-Hartman
parent a5613d7545
commit 8868dc0d90
3 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/lustre/lustre/include/lustre_dlm.h
View File

@ -1108,8 +1108,6 @@ struct ldlm_callback_suite {
}; };
/* ldlm_lockd.c */ /* 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); int ldlm_get_ref(void);
void ldlm_put_ref(void); void ldlm_put_ref(void);
struct ldlm_lock *ldlm_request_lock(struct ptlrpc_request *req); struct ldlm_lock *ldlm_request_lock(struct ptlrpc_request *req);

8
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
View File

@ -1947,17 +1947,9 @@ void ldlm_lock_cancel(struct ldlm_lock *lock)
LBUG(); LBUG();
} }
if (lock->l_flags & LDLM_FL_WAITED)
ldlm_del_waiting_lock(lock);
/* Releases cancel callback. */ /* Releases cancel callback. */
ldlm_cancel_callback(lock); 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_resource_unlink_lock(lock);
ldlm_lock_destroy_nolock(lock); ldlm_lock_destroy_nolock(lock);

13
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
View File

@ -111,19 +111,6 @@ struct ldlm_bl_work_item {
int blwi_mem_pressure; 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. * Callback handler for receiving incoming blocking ASTs.
* *