diff --git a/[refs] b/[refs] index 5fcc6fe853e8..54a416342fa0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37b2fa6a24f996d751dc80fbc8a77602cead269b +refs/heads/master: fa9f0e4925c7796afd14bf7bbf7a064078818bbc diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c index 67247f0b508a..af2f2f01bd5f 100644 --- a/trunk/fs/dlm/lock.c +++ b/trunk/fs/dlm/lock.c @@ -3283,6 +3283,8 @@ int dlm_recover_waiters_post(struct dlm_ls *ls) hold_rsb(r); lock_rsb(r); _request_lock(r, lkb); + if (is_master(r)) + confirm_master(r, 0); unlock_rsb(r); put_rsb(r); break;