--- fs/ocfs2/dlm/dlmrecovery.c

+++ fs/ocfs2/dlm/dlmrecovery.c

@@ -1941,6 +1941,8 @@ void dlm_move_lockres_to_recovery_list(s

struct list_head *queue;

struct dlm_lock *lock, *next;

+ assert_spin_locked(&dlm->spinlock);

+ assert_spin_locked(&res->spinlock);

res->state |= DLM_LOCK_RES_RECOVERING;

if (!list_empty(&res->recovering)) {

mlog(0,

@@ -2265,19 +2267,15 @@ static void dlm_do_local_recovery_cleanu

/* zero the lvb if necessary */

dlm_revalidate_lvb(dlm, res, dead_node);

if (res->owner == dead_node) {

- if (res->state & DLM_LOCK_RES_DROPPING_REF)

- mlog(0, "%s:%.*s: owned by "

- "dead node %u, this node was "

- "dropping its ref when it died. "

- "continue, dropping the flag.\n",

- dlm->name, res->lockname.len,

- res->lockname.name, dead_node);

-

- /* the wake_up for this will happen when the

- * RECOVERING flag is dropped later */

- res->state &= ~DLM_LOCK_RES_DROPPING_REF;

+ if (res->state & DLM_LOCK_RES_DROPPING_REF) {

+ mlog(ML_NOTICE, "Ignore %.*s for "

+ "recovery as it is being freed\n",

+ res->lockname.len,

+ res->lockname.name);

+ } else

+ dlm_move_lockres_to_recovery_list(dlm,

+ res);

- dlm_move_lockres_to_recovery_list(dlm, res);

} else if (res->owner == dlm->node_num) {

dlm_free_dead_locks(dlm, res, dead_node);

__dlm_lockres_calc_usage(dlm, res);