LU-4423 ldlm: use 64-bit time for pl_recalc

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

diff --git a/lustre/ldlm/ldlm_plain.c b/lustre/ldlm/ldlm_plain.c
index 6a99608..423412e 100644 (file)
--- a/lustre/ldlm/ldlm_plain.c
+++ b/lustre/ldlm/ldlm_plain.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -73,14 +69,14 @@ ldlm_plain_compat_queue(struct list_head *queue, struct ldlm_lock *req,
                        struct list_head *work_list)
 {
        enum ldlm_mode req_mode = req->l_req_mode;
-       struct ldlm_lock *lock;
-       struct list_head *tmp;
+       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. */
@@ -88,8 +84,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;
@@ -178,14 +176,29 @@ int ldlm_process_plain_lock(struct ldlm_lock *lock, __u64 *flags,
                 rc = ldlm_run_ast_work(ldlm_res_to_ns(res), &rpc_list,
                                        LDLM_WORK_BL_AST);
                 lock_res(res);
-               if (rc == -ERESTART)
+               if (rc == -ERESTART) {
+                       /* We were granted while waiting, nothing left to do */
+                       if (lock->l_granted_mode == lock->l_req_mode)
+                               GOTO(out, rc = 0);
+                       /* Lock was destroyed while we were waiting, abort */
+                       if (ldlm_is_destroyed(lock))
+                               GOTO(out, rc = -EAGAIN);
+
+                       /* Otherwise try again */
                        GOTO(restart, rc);
+               }
                 *flags |= LDLM_FL_BLOCK_GRANTED;
         } else {
                 ldlm_resource_unlink_lock(lock);
                 ldlm_grant_lock(lock, NULL);
         }
-        RETURN(0);
+
+       rc = 0;
+out:
+       *err = rc;
+       LASSERT(list_empty(&rpc_list));
+
+       RETURN(rc);
 }
 #endif /* HAVE_SERVER_SUPPORT */