Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c034396 authored by xuejiufei's avatar xuejiufei Committed by Linus Torvalds
Browse files

ocfs2/dlm: clear DROPPING_REF flag when the master goes down 



If the master goes down after return in-progress for deref message.  The
lock resource on non-master node can not be purged.  Clear the
DROPPING_REF flag and recovery it.

Signed-off-by: default avatarxuejiufei <xuejiufei@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Reviewed-by: default avatarJoseph Qi <joseph.qi@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 842b90b6

fs/ocfs2/dlm/dlmrecovery.c

+10 −8
Original line number Diff line number Diff line
@@ -2377,14 +2377,16 @@ static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node) 
			dlm_revalidate_lvb(dlm, res, dead_node);

			if (res->owner == dead_node) {

				if (res->state & DLM_LOCK_RES_DROPPING_REF) {

					mlog(ML_NOTICE, "%s: res %.*s, Skip "

					     "recovery as it is being freed\n",

					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);

				} else

						res->lockname.name, dead_node);

				}

				res->state &= ~DLM_LOCK_RES_DROPPING_REF;

				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);