* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
#define DEBUG_SUBSYSTEM S_LDLM
-#ifndef __KERNEL__
-# include <liblustre.h>
-#endif
#include <lustre_dlm.h>
#include <obd_support.h>
#include <lustre_lib.h>
+#include <obd_class.h>
#include "ldlm_internal.h"
* locks if first lock of the bunch is not conflicting with us.
*/
static int
-ldlm_inodebits_compat_queue(cfs_list_t *queue, struct ldlm_lock *req,
- cfs_list_t *work_list)
+ldlm_inodebits_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;
- __u64 req_bits = req->l_policy_data.l_inodebits.bits;
- int compat = 1;
- ENTRY;
+ struct list_head *tmp;
+ struct ldlm_lock *lock;
+ __u64 req_bits = req->l_policy_data.l_inodebits.bits;
+ int compat = 1;
+ ENTRY;
- LASSERT(req_bits); /* There is no sense in lock with no bits set,
- I think. Also such a lock would be compatible
- with any other bit lock */
+ /* There is no sense in lock with no bits set, I think.
+ * Also, such a lock would be compatible with any other bit lock */
+ LASSERT(req_bits != 0);
- cfs_list_for_each(tmp, queue) {
- cfs_list_t *mode_tail;
+ list_for_each(tmp, queue) {
+ struct list_head *mode_tail;
- lock = cfs_list_entry(tmp, struct ldlm_lock, l_res_link);
+ lock = list_entry(tmp, struct ldlm_lock, 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. */
- if (req == lock)
- RETURN(compat);
+ if (req == lock)
+ RETURN(compat);
- /* last lock in mode group */
- LASSERT(lock->l_sl_mode.prev != NULL);
- mode_tail = &cfs_list_entry(lock->l_sl_mode.prev,
- struct ldlm_lock,
- l_sl_mode)->l_res_link;
+ /* last lock in mode group */
+ LASSERT(lock->l_sl_mode.prev != NULL);
+ mode_tail = &list_entry(lock->l_sl_mode.prev,
+ struct ldlm_lock,
+ l_sl_mode)->l_res_link;
- /* locks are compatible, bits don't matter */
- if (lockmode_compat(lock->l_req_mode, req_mode)) {
- /* jump to last lock in mode group */
- tmp = mode_tail;
- continue;
- }
+ /* if reqest lock is not COS_INCOMPAT and COS is disabled,
+ * they are compatible, IOW this request is from a local
+ * transaction on a DNE system. */
+ if (lock->l_req_mode == LCK_COS && !ldlm_is_cos_incompat(req) &&
+ !ldlm_is_cos_enabled(req)) {
+ /* jump to last lock in mode group */
+ tmp = mode_tail;
+ continue;
+ }
- for (;;) {
- cfs_list_t *head;
+ /* locks' mode are compatible, bits don't matter */
+ if (lockmode_compat(lock->l_req_mode, req->l_req_mode)) {
+ /* jump to last lock in mode group */
+ tmp = mode_tail;
+ continue;
+ }
+
+ for (;;) {
+ struct list_head *head;
/* Advance loop cursor to last lock in policy group. */
- tmp = &cfs_list_entry(lock->l_sl_policy.prev,
+ tmp = &list_entry(lock->l_sl_policy.prev,
struct ldlm_lock,
l_sl_policy)->l_res_link;
* requirement: it is only compatible with
* locks from the same client. */
if (lock->l_req_mode == LCK_COS &&
+ !ldlm_is_cos_incompat(req) &&
+ ldlm_is_cos_enabled(req) &&
lock->l_client_cookie == req->l_client_cookie)
goto not_conflicting;
/* Found a conflicting policy group. */
ldlm_add_ast_work_item(lock, req,
work_list);
head = &lock->l_sl_policy;
- cfs_list_for_each_entry(lock, head, l_sl_policy)
+ list_for_each_entry(lock, head, l_sl_policy)
if (lock->l_blocking_ast)
ldlm_add_ast_work_item(lock, req,
work_list);
break;
tmp = tmp->next;
- lock = cfs_list_entry(tmp, struct ldlm_lock,
+ lock = list_entry(tmp, struct ldlm_lock,
l_res_link);
} /* Loop over policy groups within one mode group. */
} /* Loop over mode groups within @queue. */
* would be collected and ASTs sent.
*/
int ldlm_process_inodebits_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;
+
+ LASSERT(lock->l_granted_mode != lock->l_req_mode);
+ LASSERT(list_empty(&res->lr_converting));
+ INIT_LIST_HEAD(&rpc_list);
+ check_res_locked(res);
- LASSERT(cfs_list_empty(&res->lr_converting));
- check_res_locked(res);
+ /* (*flags & LDLM_FL_BLOCK_NOWAIT) is for layout lock right now. */
+ if (!first_enq || (*flags & LDLM_FL_BLOCK_NOWAIT)) {
+ *err = ELDLM_LOCK_ABORTED;
+ if (*flags & LDLM_FL_BLOCK_NOWAIT)
+ *err = ELDLM_LOCK_WOULDBLOCK;
- if (!first_enq) {
- LASSERT(work_list != NULL);
rc = ldlm_inodebits_compat_queue(&res->lr_granted, lock, NULL);
if (!rc)
RETURN(LDLM_ITER_STOP);
ldlm_resource_unlink_lock(lock);
ldlm_grant_lock(lock, work_list);
- RETURN(LDLM_ITER_CONTINUE);
- }
+
+ *err = ELDLM_OK;
+ RETURN(LDLM_ITER_CONTINUE);
+ }
restart:
rc = ldlm_inodebits_compat_queue(&res->lr_granted, lock, &rpc_list);
* 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,
LDLM_WORK_BL_AST);
lock_res(res);
- if (rc == -ERESTART)
- GOTO(restart, -ERESTART);
+ if (rc == -ERESTART)
+ GOTO(restart, rc);
*flags |= LDLM_FL_BLOCK_GRANTED;
} else {
ldlm_resource_unlink_lock(lock);
}
#endif /* HAVE_SERVER_SUPPORT */
-void ldlm_ibits_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
- ldlm_policy_data_t *lpolicy)
+void ldlm_ibits_policy_wire_to_local(const union ldlm_wire_policy_data *wpolicy,
+ union ldlm_policy_data *lpolicy)
{
- memset(lpolicy, 0, sizeof(*lpolicy));
- lpolicy->l_inodebits.bits = wpolicy->l_inodebits.bits;
+ memset(lpolicy, 0, sizeof(*lpolicy));
+ lpolicy->l_inodebits.bits = wpolicy->l_inodebits.bits;
}
-void ldlm_ibits_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,
- ldlm_wire_policy_data_t *wpolicy)
+void ldlm_ibits_policy_local_to_wire(const union ldlm_policy_data *lpolicy,
+ union ldlm_wire_policy_data *wpolicy)
{
- memset(wpolicy, 0, sizeof(*wpolicy));
- wpolicy->l_inodebits.bits = lpolicy->l_inodebits.bits;
+ memset(wpolicy, 0, sizeof(*wpolicy));
+ wpolicy->l_inodebits.bits = lpolicy->l_inodebits.bits;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff