diff options
| author | Sunil Mushran <sunil.mushran@oracle.com> | 2010-01-25 16:57:38 -0800 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2010-01-25 19:20:51 -0800 |
| commit | 2bd632165c1f783888bd4cbed95f2f304829159b (patch) | |
| tree | a4938fece1a47d22b1f8ca652a8218736b27aa3a /fs/ocfs2/dlm/dlmunlock.c | |
| parent | e5f2cb2b1ad05473fffe6970618997b906f23873 (diff) | |
| download | blackbird-op-linux-2bd632165c1f783888bd4cbed95f2f304829159b.tar.gz blackbird-op-linux-2bd632165c1f783888bd4cbed95f2f304829159b.zip | |
ocfs2/trivial: Remove trailing whitespaces
Patch removes trailing whitespaces.
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
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); |
