LU-8354 ldlm: soft lockup in ldlm_plain_compat_queue

[fs/lustre-release.git] / lustre / ldlm / ldlm_plain.c

diff --git a/lustre/ldlm/ldlm_plain.c b/lustre/ldlm/ldlm_plain.c
index 14a76b6..bbc355f 100644 (file)
--- 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"
 
@@ -76,15 +72,15 @@ 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;
-       struct ldlm_lock *lock;
-       struct list_head *tmp;
+       enum ldlm_mode req_mode = req->l_req_mode;
+       struct ldlm_lock *lock, *next_lock;
        int compat = 1;
        ENTRY;
 
        lockmode_verify(req_mode);
 
-       list_for_each_entry(lock, queue, 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,
                 * or we'd wait forever. */
@@ -92,8 +88,10 @@ ldlm_plain_compat_queue(struct list_head *queue, struct ldlm_lock *req,
                        RETURN(compat);
 
                /* Advance loop cursor to last lock of mode group. */
-               tmp = &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;
@@ -138,7 +136,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;
@@ -193,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 */
 }