# include <liblustre.h>
#endif
-#include <linux/lustre_dlm.h>
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
+#include <lustre_dlm.h>
+#include <obd_support.h>
+#include <lustre_lib.h>
#include "ldlm_internal.h"
/* Determine if the lock is compatible with all locks on the queue. */
static int
ldlm_inodebits_compat_queue(struct list_head *queue, struct ldlm_lock *req,
- int send_cbs)
+ struct list_head *work_list)
{
struct list_head *tmp;
struct ldlm_lock *lock;
int compat = 1;
ENTRY;
- LASSERT(req_bits); /* There is no sence in lock with no bits set,
+ 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 */
+
list_for_each(tmp, queue) {
+ struct list_head *mode_tail;
+
lock = list_entry(tmp, struct ldlm_lock, l_res_link);
if (req == lock)
RETURN(compat);
- /* locks are compatible, bits don't matter */
- if (lockmode_compat(lock->l_req_mode, req_mode))
- continue;
+ /* 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;
- /* if bits don't overlap skip it */
- if (!(lock->l_policy_data.l_inodebits.bits & req_bits))
+ /* 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 (!send_cbs)
- RETURN(0);
-
- compat = 0;
- if (lock->l_blocking_ast)
- ldlm_add_ast_work_item(lock, req, NULL, 0);
- }
+ }
+
+ for (;;) {
+ struct list_head *head;
+
+ /* last lock in policy group */
+ tmp = &list_entry(lock->l_sl_policy.prev,
+ struct ldlm_lock,
+ l_sl_policy)->l_res_link;
+
+ /* locks with bits overlapped are conflicting locks */
+ if (lock->l_policy_data.l_inodebits.bits & req_bits) {
+ /* conflicting policy */
+ if (!work_list)
+ RETURN(0);
+
+ compat = 0;
+
+ /* add locks of the policy group to
+ * @work_list as blocking locks for
+ * @req */
+ if (lock->l_blocking_ast)
+ ldlm_add_ast_work_item(lock, req,
+ work_list);
+ head = &lock->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);
+ }
+ if (tmp == mode_tail)
+ break;
+
+ tmp = tmp->next;
+ lock = list_entry(tmp, struct ldlm_lock, l_res_link);
+ } /* loop over policy groups within one mode group */
+ } /* loop over mode groups within @queue */
RETURN(compat);
}
/* If first_enq is 0 (ie, called from ldlm_reprocess_queue):
* - blocking ASTs have already been sent
- * - the caller has already initialized req->lr_tmp
* - must call this function with the ns lock held
*
* If first_enq is 1 (ie, called from ldlm_lock_enqueue):
* - blocking ASTs have not been sent
- * - the caller has NOT initialized req->lr_tmp, so we must
* - must call this function with the ns lock held once */
int ldlm_process_inodebits_lock(struct ldlm_lock *lock, int *flags,
- int first_enq, ldlm_error_t *err)
+ int first_enq, ldlm_error_t *err,
+ struct list_head *work_list)
{
struct ldlm_resource *res = lock->l_resource;
- struct list_head rpc_list = LIST_HEAD_INIT(rpc_list);
+ CFS_LIST_HEAD(rpc_list);
int rc;
ENTRY;
LASSERT(list_empty(&res->lr_converting));
+ check_res_locked(res);
if (!first_enq) {
- LASSERT(res->lr_tmp != NULL);
- rc = ldlm_inodebits_compat_queue(&res->lr_granted, lock, 0);
+ LASSERT(work_list != NULL);
+ rc = ldlm_inodebits_compat_queue(&res->lr_granted, lock, NULL);
if (!rc)
RETURN(LDLM_ITER_STOP);
- rc = ldlm_inodebits_compat_queue(&res->lr_waiting, lock, 0);
+ rc = ldlm_inodebits_compat_queue(&res->lr_waiting, lock, NULL);
if (!rc)
RETURN(LDLM_ITER_STOP);
ldlm_resource_unlink_lock(lock);
- ldlm_grant_lock(lock, NULL, 0, 1);
+ ldlm_grant_lock(lock, work_list);
RETURN(LDLM_ITER_CONTINUE);
}
restart:
- LASSERT(res->lr_tmp == NULL);
- res->lr_tmp = &rpc_list;
- rc = ldlm_inodebits_compat_queue(&res->lr_granted, lock, 1);
- rc += ldlm_inodebits_compat_queue(&res->lr_waiting, lock, 1);
- res->lr_tmp = NULL;
+ 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
* 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);
- l_unlock(&res->lr_namespace->ns_lock);
- rc = ldlm_run_ast_work(res->lr_namespace, &rpc_list);
- l_lock(&res->lr_namespace->ns_lock);
+ unlock_res(res);
+ rc = ldlm_run_ast_work(&rpc_list, LDLM_WORK_BL_AST);
+ lock_res(res);
if (rc == -ERESTART)
GOTO(restart, -ERESTART);
*flags |= LDLM_FL_BLOCK_GRANTED;
} else {
ldlm_resource_unlink_lock(lock);
- ldlm_grant_lock(lock, NULL, 0, 0);
+ ldlm_grant_lock(lock, NULL);
}
RETURN(0);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff