diff --git a/[refs] b/[refs] index 26f04a008f88..e080fc297a27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34e22bed19013c77f942083e25cfc7adf6c71a8f +refs/heads/master: 36098198184b0644537f4b2257d861e9bdf124bd diff --git a/trunk/fs/dlm/user.c b/trunk/fs/dlm/user.c index fd19caf9af97..494d00ac014e 100644 --- a/trunk/fs/dlm/user.c +++ b/trunk/fs/dlm/user.c @@ -175,7 +175,7 @@ void dlm_user_add_ast(struct dlm_lkb *lkb, int type) /* noqueue requests that fail may need to be removed from the proc's locks list, there should be a better way of detecting this situation than checking all these things... */ - + if (type == AST_COMP && lkb->lkb_grmode == DLM_LOCK_IV && ua->lksb.sb_status == -EAGAIN && !list_empty(&lkb->lkb_ownqueue)) remove_ownqueue = 1;