Commit 53ecd25e authored Feb 03, 2009 by Sunil Mushran Committed by Mark Fasheh Feb 26, 2009

ocfs2/dlm: Make dlm_assert_master_handler() kill itself instead of the asserter



In dlm_assert_master_handler(), if we get an incorrect assert master from a node
that, we reply with EINVAL asking the asserter to die. The problem is that an
assert is sent after so many hoops, it is invariably the node that thinks the
asserter is wrong, is actually wrong. So instead of killing the asserter, this
patch kills the assertee.

This patch papers over a race that is still being addressed.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Acked-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

parent dabc47de

fs/ocfs2/dlm/dlmmaster.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1849,12 +1849,12 @@ int dlm_assert_master_handler(struct o2net_msg msg, u32 len, void data,
		if (!mle) {
		if (res->owner != DLM_LOCK_RES_OWNER_UNKNOWN &&
		res->owner != assert->node_idx) {
		mlog(ML_ERROR, "assert_master from "
		"%u, but current owner is "
		"%u! (%.*s)\n",
		assert->node_idx, res->owner,
		namelen, name);
		goto kill;
		mlog(ML_ERROR, "DIE! Mastery assert from %u, "
		"but current owner is %u! (%.*s)\n",
		assert->node_idx, res->owner, namelen,
		name);
		__dlm_print_one_lock_resource(res);
		BUG();
		}
		} else if (mle->type != DLM_MLE_MIGRATION) {
		if (res->owner != DLM_LOCK_RES_OWNER_UNKNOWN) {

Admin message