diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/dlm/lock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index d8e919bad41a..ed52485a86d0 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c | |||
@@ -3148,6 +3148,7 @@ static void recover_convert_waiter(struct dlm_ls *ls, struct dlm_lkb *lkb) | |||
3148 | if (middle_conversion(lkb)) { | 3148 | if (middle_conversion(lkb)) { |
3149 | hold_lkb(lkb); | 3149 | hold_lkb(lkb); |
3150 | ls->ls_stub_ms.m_result = -EINPROGRESS; | 3150 | ls->ls_stub_ms.m_result = -EINPROGRESS; |
3151 | ls->ls_stub_ms.m_flags = lkb->lkb_flags; | ||
3151 | _remove_from_waiters(lkb); | 3152 | _remove_from_waiters(lkb); |
3152 | _receive_convert_reply(lkb, &ls->ls_stub_ms); | 3153 | _receive_convert_reply(lkb, &ls->ls_stub_ms); |
3153 | 3154 | ||
@@ -3221,6 +3222,7 @@ void dlm_recover_waiters_pre(struct dlm_ls *ls) | |||
3221 | case DLM_MSG_UNLOCK: | 3222 | case DLM_MSG_UNLOCK: |
3222 | hold_lkb(lkb); | 3223 | hold_lkb(lkb); |
3223 | ls->ls_stub_ms.m_result = -DLM_EUNLOCK; | 3224 | ls->ls_stub_ms.m_result = -DLM_EUNLOCK; |
3225 | ls->ls_stub_ms.m_flags = lkb->lkb_flags; | ||
3224 | _remove_from_waiters(lkb); | 3226 | _remove_from_waiters(lkb); |
3225 | _receive_unlock_reply(lkb, &ls->ls_stub_ms); | 3227 | _receive_unlock_reply(lkb, &ls->ls_stub_ms); |
3226 | dlm_put_lkb(lkb); | 3228 | dlm_put_lkb(lkb); |
@@ -3229,6 +3231,7 @@ void dlm_recover_waiters_pre(struct dlm_ls *ls) | |||
3229 | case DLM_MSG_CANCEL: | 3231 | case DLM_MSG_CANCEL: |
3230 | hold_lkb(lkb); | 3232 | hold_lkb(lkb); |
3231 | ls->ls_stub_ms.m_result = -DLM_ECANCEL; | 3233 | ls->ls_stub_ms.m_result = -DLM_ECANCEL; |
3234 | ls->ls_stub_ms.m_flags = lkb->lkb_flags; | ||
3232 | _remove_from_waiters(lkb); | 3235 | _remove_from_waiters(lkb); |
3233 | _receive_cancel_reply(lkb, &ls->ls_stub_ms); | 3236 | _receive_cancel_reply(lkb, &ls->ls_stub_ms); |
3234 | dlm_put_lkb(lkb); | 3237 | dlm_put_lkb(lkb); |