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: 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 ec717ebb17017506ec653f3054e5cc555fed753a..5a72f22882a04ff2429b7c83cf920211057184d1 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
@@ -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);

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
index 536f97cfd13c075fa9e5f22dd662e401d2885ba1..133936efc90563af84cbd5e9afbace7ac035c021 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
@@ -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);
 

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
index 57f6128d570146252f7d71adf8b41b2a58c0b049..045e3c66139ffbbe49420d4979f4b5d9ad77f1ef 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
@@ -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.
  *