diff options
| author | Sunil Mushran <sunil.mushran@oracle.com> | 2009-02-03 23:37:13 +0300 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2009-02-26 22:51:09 +0300 |
| commit | 7dc102b737e9f49dac426161294cb2d326a97d8e (patch) | |
| tree | 6073525b25fa7ab423099e808866cfdf96f668dd /fs | |
| parent | 47be12e4eec84c1846f29af64fe25a396b57a026 (diff) | |
| download | linux-7dc102b737e9f49dac426161294cb2d326a97d8e.tar.xz | |
ocfs2/dlm: Retract fix for race between purge and migrate
Mainline commit d4f7e650e55af6b235871126f747da88600e8040 attempts to delay
the dlm_thread from sending the drop ref message if the lockres is being
migrated. The problem is that we make the dlm_thread wait for the migration
to complete. This causes a deadlock as dlm_thread also participates in the
lockres migration process.
A better fix for the original oss bugzilla#1012 is in testing.
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Acked-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/dlm/dlmthread.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c index d1295203029f..4060bb328bc8 100644 --- a/fs/ocfs2/dlm/dlmthread.c +++ b/fs/ocfs2/dlm/dlmthread.c @@ -181,8 +181,7 @@ static int dlm_purge_lockres(struct dlm_ctxt *dlm, spin_lock(&res->spinlock); /* This ensures that clear refmap is sent after the set */ - __dlm_wait_on_lockres_flags(res, (DLM_LOCK_RES_SETREF_INPROG | - DLM_LOCK_RES_MIGRATING)); + __dlm_wait_on_lockres_flags(res, DLM_LOCK_RES_SETREF_INPROG); spin_unlock(&res->spinlock); /* clear our bit from the master's refmap, ignore errors */ |