diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-02-17 23:08:58 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-02-17 23:08:58 +0100 |
| commit | 80c20d543d142ee54ec85259b77aaf0b83c32db5 (patch) | |
| tree | 364017b2c001939bbb645dcc20d565c1f71b13a8 /fs/ocfs2/dlm/dlmunlock.c | |
| parent | OMAP4: MCPDM: Register McPDM platform device (diff) | |
| parent | omap: Remove DEBUG_FS dependency for mux name checking (diff) | |
| download | linux-80c20d543d142ee54ec85259b77aaf0b83c32db5.tar.xz linux-80c20d543d142ee54ec85259b77aaf0b83c32db5.zip | |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'fs/ocfs2/dlm/dlmunlock.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmunlock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/dlm/dlmunlock.c b/fs/ocfs2/dlm/dlmunlock.c index 00f53b2aea76..49e29ecd0201 100644 --- a/fs/ocfs2/dlm/dlmunlock.c +++ b/fs/ocfs2/dlm/dlmunlock.c @@ -190,8 +190,8 @@ static enum dlm_status dlmunlock_common(struct dlm_ctxt *dlm, actions &= ~(DLM_UNLOCK_REMOVE_LOCK| DLM_UNLOCK_REGRANT_LOCK| DLM_UNLOCK_CLEAR_CONVERT_TYPE); - } else if (status == DLM_RECOVERING || - status == DLM_MIGRATING || + } else if (status == DLM_RECOVERING || + status == DLM_MIGRATING || status == DLM_FORWARD) { /* must clear the actions because this unlock * is about to be retried. cannot free or do @@ -661,14 +661,14 @@ retry: if (call_ast) { mlog(0, "calling unlockast(%p, %d)\n", data, status); if (is_master) { - /* it is possible that there is one last bast + /* it is possible that there is one last bast * pending. make sure it is flushed, then * call the unlockast. * not an issue if this is a mastered remotely, * since this lock has been removed from the * lockres queues and cannot be found. */ dlm_kick_thread(dlm, NULL); - wait_event(dlm->ast_wq, + wait_event(dlm->ast_wq, dlm_lock_basts_flushed(dlm, lock)); } (*unlockast)(data, status); |