Land latest b_llp_hp changes on b_flock.q

diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c
index b0123a3..b5c7b45 100644 (file)
--- a/lustre/ldlm/ldlm_flock.c
+++ b/lustre/ldlm/ldlm_flock.c
@@ -305,7 +305,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, int *flags, int first_enq,
                  * release the ns_lock, allocate the new lock,
                  * and restart processing this lock. */
                 new2 = ldlm_lock_create(ns, NULL, res->lr_name, LDLM_FLOCK,
-                                        lock->l_granted_mode, NULL, NULL);
+                                        lock->l_granted_mode, NULL, NULL, NULL);
                 if (!new2) {
                         ldlm_flock_destroy(req, lock->l_granted_mode, *flags);
                         *err = -ENOLCK;
@@ -404,7 +404,7 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, int flags, void *data)
         LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, "
                    "sleeping");
 
-        ldlm_lock_dump(D_OTHER, lock);
+        ldlm_lock_dump(D_OTHER, lock, 0);
 
         fwd.fwd_lock = lock;
         obd = class_exp2obd(lock->l_conn_export);

diff --git a/lustre/ldlm/ldlm_plain.c b/lustre/ldlm/ldlm_plain.c
index af55c17..aa98af6 100644 (file)
--- a/lustre/ldlm/ldlm_plain.c
+++ b/lustre/ldlm/ldlm_plain.c
@@ -106,6 +106,6 @@ ldlm_process_plain_lock(struct ldlm_lock *lock, int *flags, int first_enq,
         }
 
         list_del_init(&lock->l_res_link);
-        ldlm_grant_lock(lock, NULL, 0, 1);
+        ldlm_grant_lock(lock, NULL, 0, !first_enq);
         RETURN(LDLM_ITER_CONTINUE);
 }