X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_plain.c;h=bbc355f5d5d6aa596e9b9b0bbf1594f80add9524;hb=76c696d545677bab4ce9641b9eff338fe99f6396;hp=7c44f728dee3c4322d22889696c8b1620a7766a5;hpb=0bb171673e30fa3271b851f6274ca9cdb8f5e55f;p=fs%2Flustre-release.git

diff --git a/lustre/ldlm/ldlm_plain.c b/lustre/ldlm/ldlm_plain.c
index 7c44f72..bbc355f 100644
--- a/lustre/ldlm/ldlm_plain.c
+++ b/lustre/ldlm/ldlm_plain.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -52,13 +52,9 @@
 
 #define DEBUG_SUBSYSTEM S_LDLM
 
-#ifdef __KERNEL__
 #include <lustre_dlm.h>
 #include <obd_support.h>
 #include <lustre_lib.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include "ldlm_internal.h"
 
@@ -73,19 +69,17 @@
  * \retval 1 if the lock is compatible to all locks in \a queue
  */
 static inline int
-ldlm_plain_compat_queue(cfs_list_t *queue, struct ldlm_lock *req,
-                        cfs_list_t *work_list)
+ldlm_plain_compat_queue(struct list_head *queue, struct ldlm_lock *req,
+			struct list_head *work_list)
 {
-        cfs_list_t *tmp;
-        struct ldlm_lock *lock;
-        ldlm_mode_t req_mode = req->l_req_mode;
-        int compat = 1;
-        ENTRY;
+	enum ldlm_mode req_mode = req->l_req_mode;
+	struct ldlm_lock *lock, *next_lock;
+	int compat = 1;
+	ENTRY;
 
-        lockmode_verify(req_mode);
+	lockmode_verify(req_mode);
 
-        cfs_list_for_each(tmp, queue) {
-                lock = cfs_list_entry(tmp, struct ldlm_lock, l_res_link);
+	list_for_each_entry_safe(lock, next_lock, queue, l_res_link) {
 
 		/* We stop walking the queue if we hit ourselves so we don't
 		 * take conflicting locks enqueued after us into account,
@@ -94,9 +88,10 @@ ldlm_plain_compat_queue(cfs_list_t *queue, struct ldlm_lock *req,
 			RETURN(compat);
 
 		/* Advance loop cursor to last lock of mode group. */
-		tmp = &cfs_list_entry(lock->l_sl_mode.prev,
-				      struct ldlm_lock,
-				      l_sl_mode)->l_res_link;
+		next_lock = list_entry(list_entry(lock->l_sl_mode.prev,
+						  struct ldlm_lock,
+						  l_sl_mode)->l_res_link.next,
+				       struct ldlm_lock, l_res_link);
 
 		if (lockmode_compat(lock->l_req_mode, req_mode))
                         continue;
@@ -112,10 +107,10 @@ ldlm_plain_compat_queue(cfs_list_t *queue, struct ldlm_lock *req,
                         ldlm_add_ast_work_item(lock, req, work_list);
 
                 {
-                        cfs_list_t *head;
+			struct list_head *head;
 
                         head = &lock->l_sl_mode;
-                        cfs_list_for_each_entry(lock, head, l_sl_mode)
+			list_for_each_entry(lock, head, l_sl_mode)
                                 if (lock->l_blocking_ast)
                                         ldlm_add_ast_work_item(lock, req,
                                                                work_list);
@@ -141,16 +136,18 @@ ldlm_plain_compat_queue(cfs_list_t *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,
-			    cfs_list_t *work_list)
+			    int first_enq, enum ldlm_error *err,
+			    struct list_head *work_list)
 {
-        struct ldlm_resource *res = lock->l_resource;
-        CFS_LIST_HEAD(rpc_list);
-        int rc;
-        ENTRY;
+	struct ldlm_resource *res = lock->l_resource;
+	struct list_head rpc_list;
+	int rc;
+	ENTRY;
 
-        check_res_locked(res);
-        LASSERT(cfs_list_empty(&res->lr_converting));
+	LASSERT(lock->l_granted_mode != lock->l_req_mode);
+	check_res_locked(res);
+	LASSERT(list_empty(&res->lr_converting));
+	INIT_LIST_HEAD(&rpc_list);
 
         if (!first_enq) {
                 LASSERT(work_list != NULL);
@@ -177,7 +174,7 @@ int ldlm_process_plain_lock(struct ldlm_lock *lock, __u64 *flags,
                  * bug 2322: we used to unlink and re-add here, which was a
                  * terrible folly -- if we goto restart, we could get
                  * re-ordered!  Causes deadlock, because ASTs aren't sent! */
-                if (cfs_list_empty(&lock->l_res_link))
+		if (list_empty(&lock->l_res_link))
                         ldlm_resource_add_lock(res, &res->lr_waiting, lock);
                 unlock_res(res);
                 rc = ldlm_run_ast_work(ldlm_res_to_ns(res), &rpc_list,
@@ -194,14 +191,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 */
 }