*
* 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) 2004, 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/
#include <lustre_dlm.h>
#include <obd_support.h>
#include <lustre_lib.h>
+#include <obd_class.h>
#include "ldlm_internal.h"
{
struct list_head *tmp;
struct ldlm_lock *lock;
- enum ldlm_mode req_mode = req->l_req_mode;
__u64 req_bits = req->l_policy_data.l_inodebits.bits;
int compat = 1;
ENTRY;
/* 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);
+ /* 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;
- }
-
- for (;;) {
+ struct ldlm_lock,
+ l_sl_mode)->l_res_link;
+
+ /* 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;
+ }
+
+ /* 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. */
* 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. */
* This function looks for any conflicts for \a lock in the granted or
* waiting queues. The lock is granted if no conflicts are found in
* either queue.
- *
- * If \a first_enq is 0 (ie, called from ldlm_reprocess_queue):
- * - blocking ASTs have already been sent
- *
- * If \a first_enq is 1 (ie, called from ldlm_lock_enqueue):
- * - blocking ASTs have not been sent yet, so list of conflicting locks
- * would be collected and ASTs sent.
*/
int ldlm_process_inodebits_lock(struct ldlm_lock *lock, __u64 *flags,
- int first_enq, enum ldlm_error *err,
+ enum ldlm_process_intention intention,
+ enum ldlm_error *err,
struct list_head *work_list)
{
struct ldlm_resource *res = lock->l_resource;
check_res_locked(res);
/* (*flags & LDLM_FL_BLOCK_NOWAIT) is for layout lock right now. */
- if (!first_enq || (*flags & LDLM_FL_BLOCK_NOWAIT)) {
+ if (intention == LDLM_PROCESS_RESCAN ||
+ (*flags & LDLM_FL_BLOCK_NOWAIT)) {
*err = ELDLM_LOCK_ABORTED;
if (*flags & LDLM_FL_BLOCK_NOWAIT)
*err = ELDLM_LOCK_WOULDBLOCK;
ldlm_grant_lock(lock, work_list);
*err = ELDLM_OK;
- RETURN(LDLM_ITER_CONTINUE);
- }
+ RETURN(LDLM_ITER_CONTINUE);
+ }
+ LASSERT((intention == LDLM_PROCESS_ENQUEUE && work_list == NULL) ||
+ (intention == LDLM_PROCESS_RECOVERY && work_list != NULL));
restart:
rc = ldlm_inodebits_compat_queue(&res->lr_granted, lock, &rpc_list);
rc += ldlm_inodebits_compat_queue(&res->lr_waiting, lock, &rpc_list);
if (rc != 2) {
- /* If either of the compat_queue()s returned 0, then we
- * have ASTs to send and must go onto the waiting 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 (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);
+ rc = ldlm_handle_conflict_lock(lock, flags, &rpc_list, 0);
if (rc == -ERESTART)
GOTO(restart, rc);
- *flags |= LDLM_FL_BLOCK_GRANTED;
- } else {
- ldlm_resource_unlink_lock(lock);
- ldlm_grant_lock(lock, NULL);
- }
- RETURN(0);
+ *err = rc;
+ } else {
+ ldlm_resource_unlink_lock(lock);
+ ldlm_grant_lock(lock, work_list);
+ rc = 0;
+ }
+
+ if (!list_empty(&rpc_list))
+ ldlm_discard_bl_list(&rpc_list);
+
+ RETURN(rc);
}
#endif /* HAVE_SERVER_SUPPORT */
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;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff