Revert "b=22244 fix ref count issue (take 2)"

This reverts commit 654e6452ae03aa35e81e23b9b0408c1e988b8f4d.
Reverting all patches from 22244 & 21128 because of test failures.
See 22244 for more info.

diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index 8528f8e..b582c66 100644 (file)
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -1592,40 +1592,21 @@ static int ldlm_callback_reply(struct ptlrpc_request *req, int rc)
 }
 
 #ifdef __KERNEL__
-static int __ldlm_bl_to_thread(struct ldlm_bl_work_item *blwi, int mode)
+static int __ldlm_bl_to_thread(struct ldlm_namespace *ns, struct ldlm_bl_work_item *blwi,
+                             struct ldlm_lock_desc *ld, struct ldlm_lock *lock,
+                             struct list_head *cancels, int count, int mode)
 {
         struct ldlm_bl_pool *blp = ldlm_state->ldlm_bl_pool;
         ENTRY;
 
-        spin_lock(&blp->blp_lock);
-        if (blwi->blwi_lock && blwi->blwi_lock->l_flags & LDLM_FL_DISCARD_DATA) {
-                /* add LDLM_FL_DISCARD_DATA requests to the priority list */
-                list_add_tail(&blwi->blwi_entry, &blp->blp_prio_list);
-        } else {
-                /* other blocking callbacks are added to the regular list */
-                list_add_tail(&blwi->blwi_entry, &blp->blp_list);
+        if (cancels && count == 0) {
+                if (mode == LDLM_ASYNC)
+                        OBD_FREE(blwi, sizeof(*blwi));
+                RETURN(0);
         }
-        spin_unlock(&blp->blp_lock);
 
-        cfs_waitq_signal(&blp->blp_waitq);
-
-        if (mode == LDLM_SYNC)
-                wait_for_completion(&blwi->blwi_comp);
-
-        RETURN(0);
-}
-
-static inline void init_blwi(struct ldlm_bl_work_item *blwi,
-                             struct ldlm_namespace *ns,
-                             struct ldlm_lock_desc *ld,
-                             struct list_head *cancels, int count,
-                             struct ldlm_lock *lock)
-{
         init_completion(&blwi->blwi_comp);
-        /* set ref count to 1 initially, supposed to be released in
-         * ldlm_bl_thread_main(), if not allocated on the stack */
         atomic_set(&blwi->blwi_ref_count, 1);
-        CFS_INIT_LIST_HEAD(&blwi->blwi_head);
 
         blwi->blwi_ns = ns;
         if (ld != NULL)
@@ -1637,6 +1618,23 @@ static inline void init_blwi(struct ldlm_bl_work_item *blwi,
         } else {
                 blwi->blwi_lock = lock;
         }
+
+        spin_lock(&blp->blp_lock);
+        if (lock && lock->l_flags & LDLM_FL_DISCARD_DATA) {
+                /* add LDLM_FL_DISCARD_DATA requests to the priority list */
+                list_add_tail(&blwi->blwi_entry, &blp->blp_prio_list);
+        } else {
+                /* other blocking callbacks are added to the regular list */
+                list_add_tail(&blwi->blwi_entry, &blp->blp_list);
+        }
+        spin_unlock(&blp->blp_lock);
+
+        cfs_waitq_signal(&blp->blp_waitq);
+
+        if (mode == LDLM_SYNC)
+                wait_for_completion(&blwi->blwi_comp);
+
+        RETURN(0);
 }
 
 static int ldlm_bl_to_thread(struct ldlm_namespace *ns,
@@ -1645,27 +1643,22 @@ static int ldlm_bl_to_thread(struct ldlm_namespace *ns,
 {
         ENTRY;
 
-        if (cancels && count == 0)
-                RETURN(0);
-
         if (mode == LDLM_SYNC) {
                 /* if it is synchronous call do minimum mem alloc, as it could
                  * be triggered from kernel shrinker
                  */
                 struct ldlm_bl_work_item blwi;
                 memset(&blwi, 0, sizeof(blwi));
-                init_blwi(&blwi, ns, ld, cancels, count, lock);
                 /* take extra ref as this obj is on stack */
                 ldlm_bl_work_item_get(&blwi);
-                RETURN(__ldlm_bl_to_thread(&blwi, mode));
+                RETURN(__ldlm_bl_to_thread(ns, &blwi, ld, lock, cancels, count, mode));
         } else {
                 struct ldlm_bl_work_item *blwi;
                 OBD_ALLOC(blwi, sizeof(*blwi));
                 if (blwi == NULL)
                         RETURN(-ENOMEM);
-                init_blwi(blwi, ns, ld, cancels, count, lock);
 
-                RETURN(__ldlm_bl_to_thread(blwi, mode));
+                RETURN(__ldlm_bl_to_thread(ns, blwi, ld, lock, cancels, count, mode));
         }
 }
 #endif