diff options
Diffstat (limited to 'fs/ocfs2/dlm/dlmthread.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmthread.c | 13 | 
1 files changed, 8 insertions, 5 deletions
diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c index 9db869de829..69aac6f088a 100644 --- a/fs/ocfs2/dlm/dlmthread.c +++ b/fs/ocfs2/dlm/dlmthread.c @@ -259,12 +259,15 @@ static void dlm_run_purge_list(struct dlm_ctxt *dlm,  		 * refs on it. */  		unused = __dlm_lockres_unused(lockres);  		if (!unused || -		    (lockres->state & DLM_LOCK_RES_MIGRATING)) { +		    (lockres->state & DLM_LOCK_RES_MIGRATING) || +		    (lockres->inflight_assert_workers != 0)) {  			mlog(0, "%s: res %.*s is in use or being remastered, " -			     "used %d, state %d\n", dlm->name, -			     lockres->lockname.len, lockres->lockname.name, -			     !unused, lockres->state); -			list_move_tail(&dlm->purge_list, &lockres->purge); +			     "used %d, state %d, assert master workers %u\n", +			     dlm->name, lockres->lockname.len, +			     lockres->lockname.name, +			     !unused, lockres->state, +			     lockres->inflight_assert_workers); +			list_move_tail(&lockres->purge, &dlm->purge_list);  			spin_unlock(&lockres->spinlock);  			continue;  		}  | 
