From 306568f7bf911e30ec0b3908ec58d1a23adfb025 Mon Sep 17 00:00:00 2001 From: Sunil Mushran Date: Tue, 3 Feb 2009 12:37:13 -0800 Subject: [PATCH] --- yaml --- r: 131817 b: refs/heads/master c: 7dc102b737e9f49dac426161294cb2d326a97d8e h: refs/heads/master i: 131815: 2d863fd149d62fe6f9d83f920de6d2cd2deaab47 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/dlm/dlmthread.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d90ce5e267d9..dd73b78156e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47be12e4eec84c1846f29af64fe25a396b57a026 +refs/heads/master: 7dc102b737e9f49dac426161294cb2d326a97d8e diff --git a/trunk/fs/ocfs2/dlm/dlmthread.c b/trunk/fs/ocfs2/dlm/dlmthread.c index d1295203029f..4060bb328bc8 100644 --- a/trunk/fs/ocfs2/dlm/dlmthread.c +++ b/trunk/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 */