From: dmilos <dmilos>
Date: Wed, 17 Sep 2003 16:33:54 +0000 (+0000)
Subject: Land latest b_llp_hp changes on b_flock.q
X-Git-Tag: v1_7_100~1^90~14
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=21fc788c4358329cb7c7c18199bc1ee412fa9c38;p=fs%2Flustre-release.git

Land latest b_llp_hp changes on b_flock.q
---

diff --git a/lustre/ldlm/ldlm_internal.h b/lustre/ldlm/ldlm_internal.h
index 9bb0df6..5aca55f 100644
--- a/lustre/ldlm/ldlm_internal.h
+++ b/lustre/ldlm/ldlm_internal.h
@@ -7,4 +7,7 @@ void ldlm_grant_lock(struct ldlm_lock *lock, void *data, int datalen,
 struct ldlm_lock *
 ldlm_lock_create(struct ldlm_namespace *ns,
                  struct lustre_handle *parent_lock_handle, struct ldlm_res_id,
-                 __u32 type, ldlm_mode_t, ldlm_blocking_callback, void *data);
+                 __u32 type, ldlm_mode_t, ldlm_blocking_callback,
+                 ldlm_completion_callback, void *data);
+ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *, struct ldlm_lock **,
+                               void *cookie, int cookie_len, int *flags);