X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_inodebits.c;h=97f941f89c0b27a4ca6d57707e3fe77934404afd;hb=b1e3e330d945a2ce78b7a0d794006c2b00698013;hp=d8e7c3bedb7890dda7ee80c101742dc6e9f030d3;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56;p=fs%2Flustre-release.git diff --git a/lustre/ldlm/ldlm_inodebits.c b/lustre/ldlm/ldlm_inodebits.c index d8e7c3b..97f941f 100644 --- a/lustre/ldlm/ldlm_inodebits.c +++ b/lustre/ldlm/ldlm_inodebits.c @@ -62,7 +62,7 @@ ldlm_inodebits_compat_queue(struct list_head *queue, struct ldlm_lock *req, l_sl_mode)->l_res_link; continue; } - + tmp_tail = tmp; if (LDLM_SL_HEAD(&lock->l_sl_mode)) tmp_tail = &list_entry(lock->l_sl_mode.next, @@ -74,7 +74,7 @@ ldlm_inodebits_compat_queue(struct list_head *queue, struct ldlm_lock *req, /* conflicting policy */ if (!work_list) RETURN(0); - + compat = 0; if (lock->l_blocking_ast) ldlm_add_ast_work_item(lock, req, @@ -112,12 +112,10 @@ ldlm_inodebits_compat_queue(struct list_head *queue, struct ldlm_lock *req, /* 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,