ocfs2/dlm: Retract fix for race between purge and migrate
Mainline commit d4f7e650e5
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>
This commit is contained in:
parent
47be12e4ee
commit
7dc102b737
|
@ -181,8 +181,7 @@ static int dlm_purge_lockres(struct dlm_ctxt *dlm,
|
||||||
|
|
||||||
spin_lock(&res->spinlock);
|
spin_lock(&res->spinlock);
|
||||||
/* This ensures that clear refmap is sent after the set */
|
/* This ensures that clear refmap is sent after the set */
|
||||||
__dlm_wait_on_lockres_flags(res, (DLM_LOCK_RES_SETREF_INPROG |
|
__dlm_wait_on_lockres_flags(res, DLM_LOCK_RES_SETREF_INPROG);
|
||||||
DLM_LOCK_RES_MIGRATING));
|
|
||||||
spin_unlock(&res->spinlock);
|
spin_unlock(&res->spinlock);
|
||||||
|
|
||||||
/* clear our bit from the master's refmap, ignore errors */
|
/* clear our bit from the master's refmap, ignore errors */
|
||||||
|
|
Loading…
Reference in a new issue