X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_plain.c;h=6a9960800908be43d782411d147030a9561e08b8;hb=3b7d27ea22faf1c6d0a37afa724fd9b5c3240322;hp=dd3df5a6b62bb4156b641eefc76160c276eb829f;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850;p=fs%2Flustre-release.git

diff --git a/lustre/ldlm/ldlm_plain.c b/lustre/ldlm/ldlm_plain.c
index dd3df5a..6a99608 100644
--- a/lustre/ldlm/ldlm_plain.c
+++ b/lustre/ldlm/ldlm_plain.c
@@ -72,7 +72,7 @@ static inline int
 ldlm_plain_compat_queue(struct list_head *queue, struct ldlm_lock *req,
 			struct list_head *work_list)
 {
-	ldlm_mode_t req_mode = req->l_req_mode;
+	enum ldlm_mode req_mode = req->l_req_mode;
 	struct ldlm_lock *lock;
 	struct list_head *tmp;
 	int compat = 1;
@@ -134,7 +134,7 @@ ldlm_plain_compat_queue(struct list_head *queue, struct ldlm_lock *req,
  *     would be collected and ASTs sent.
  */
 int ldlm_process_plain_lock(struct ldlm_lock *lock, __u64 *flags,
-			    int first_enq, ldlm_error_t *err,
+			    int first_enq, enum ldlm_error *err,
 			    struct list_head *work_list)
 {
 	struct ldlm_resource *res = lock->l_resource;
@@ -189,14 +189,14 @@ int ldlm_process_plain_lock(struct ldlm_lock *lock, __u64 *flags,
 }
 #endif /* HAVE_SERVER_SUPPORT */
 
-void ldlm_plain_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                     ldlm_policy_data_t *lpolicy)
+void ldlm_plain_policy_wire_to_local(const union ldlm_wire_policy_data *wpolicy,
+				     union ldlm_policy_data *lpolicy)
 {
-        /* No policy for plain locks */
+	/* No policy for plain locks */
 }
 
-void ldlm_plain_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,
-                                     ldlm_wire_policy_data_t *wpolicy)
+void ldlm_plain_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
+				     union ldlm_wire_policy_data *wpolicy)
 {
-        /* No policy for plain locks */
+	/* No policy for plain locks */
 }