X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_plain.c;h=c6b2c891dc417a1c57fdeca732bdf70392a040e4;hb=8c82ab5cd92ee70a4cda2fe6437861e56f3fe3d5;hp=b28d89e0f5c3587371e30e30b5683745bf6ad80e;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56;p=fs%2Flustre-release.git diff --git a/lustre/ldlm/ldlm_plain.c b/lustre/ldlm/ldlm_plain.c index b28d89e..c6b2c89 100644 --- a/lustre/ldlm/ldlm_plain.c +++ b/lustre/ldlm/ldlm_plain.c @@ -69,6 +69,7 @@ ldlm_plain_compat_queue(struct list_head *queue, struct ldlm_lock *req, compat = 0; if (lock->l_blocking_ast) ldlm_add_ast_work_item(lock, req, work_list); + if (LDLM_SL_HEAD(&lock->l_sl_mode)) { /* add all members of the mode group */ do { @@ -87,12 +88,10 @@ ldlm_plain_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 resource 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 resource lock held */ int ldlm_process_plain_lock(struct ldlm_lock *lock, int *flags, int first_enq, ldlm_error_t *err, struct list_head *work_list)