1 From: Sunil Mushran <sunil.mushran@oracle.com>
2 Date: Tue, 16 Dec 2008 15:49:21 -0800
3 Subject: ocfs2/dlm: Hold off sending lockres drop ref message while lockres is migrating
7 During lockres purge, o2dlm sends a drop reference message to the lockres
8 master. This patch delays the message if the lockres is being migrated.
10 Fixes oss bugzilla#1012
11 http://oss.oracle.com/bugzilla/show_bug.cgi?id=1012
13 Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
14 Signed-off-by: Mark Fasheh <mfasheh@suse.com>
16 fs/ocfs2/dlm/dlmthread.c | 3 ++-
17 1 files changed, 2 insertions(+), 1 deletions(-)
19 diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c
20 index 4060bb3..d129520 100644
21 --- a/fs/ocfs2/dlm/dlmthread.c
22 +++ b/fs/ocfs2/dlm/dlmthread.c
23 @@ -181,7 +181,8 @@ static int dlm_purge_lockres(struct dlm_ctxt *dlm,
25 spin_lock(&res->spinlock);
26 /* This ensures that clear refmap is sent after the set */
27 - __dlm_wait_on_lockres_flags(res, DLM_LOCK_RES_SETREF_INPROG);
28 + __dlm_wait_on_lockres_flags(res, (DLM_LOCK_RES_SETREF_INPROG |
29 + DLM_LOCK_RES_MIGRATING));
30 spin_unlock(&res->spinlock);
32 /* clear our bit from the master's refmap, ignore errors */