*
* 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
*/
* 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, 2016, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
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. */
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;
* 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;
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 */
-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 */
}