Merge latest b_llp_hp changes onto b_flock

diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c
index 72d5229..b12e69b 100644 (file)
--- a/lustre/ldlm/ldlm_flock.c
+++ b/lustre/ldlm/ldlm_flock.c
@@ -32,6 +32,8 @@
 #include <liblustre.h>
 #endif
 
+#include "ldlm_internal.h"
+
 #define l_flock_waitq   l_lru
 #define l_flock_blocker l_parent
 

diff --git a/lustre/ldlm/ldlm_plain.c b/lustre/ldlm/ldlm_plain.c
index c3413ca..0efc294 100644 (file)
--- a/lustre/ldlm/ldlm_plain.c
+++ b/lustre/ldlm/ldlm_plain.c
@@ -31,6 +31,8 @@
 #include <liblustre.h>
 #endif
 
+#include "ldlm_internal.h"
+
 static inline int
 ldlm_plain_compat_queue(struct list_head *queue, struct ldlm_lock *req,
                         int first_enq)
@@ -104,6 +106,6 @@ ldlm_plain_enqueue(struct ldlm_lock *lock, int *flags, int first_enq,
         }
 
         list_del_init(&lock->l_res_link);
-        ldlm_grant_lock(lock, NULL, 0);
+        ldlm_grant_lock(lock, NULL, 0, 1);
         RETURN(LDLM_ITER_CONTINUE);
 }