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

Commit cda70ba8 authored by Sunil Mushran's avatar Sunil Mushran Committed by Joel Becker
Browse files

ocfs2/dlm: Remove BUG_ON in dlm recovery when freeing locks of a dead node 

During recovery, the dlm frees the locks for the dead node. If it finds a
lock in a resource for the dead node, it expects that node to also have a
ref in that lock resource. If not, it BUGs.

ossbz#1175 was filed with the above BUG. Now, while it is correct that we
should be expecting the ref, I see no reason why we have to BUG. After all,
we are freeing up the lock and clearing the ref.

This patch replaces the BUG_ON with a printk(). Hopefully, that will give
us more clues next time this happens.

http://oss.oracle.com/bugzilla/show_bug.cgi?id=1175



Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Acked-by: default avatarMark Fasheh <mfasheh@suse.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 079b8057

fs/ocfs2/dlm/dlmrecovery.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -2243,7 +2243,12 @@ static void dlm_free_dead_locks(struct dlm_ctxt *dlm, 
		mlog(0, "%s:%.*s: freed %u locks for dead node %u, "

		mlog(0, "%s:%.*s: freed %u locks for dead node %u, "

		     "dropping ref from lockres\n", dlm->name,

		     "dropping ref from lockres\n", dlm->name,

		     res->lockname.len, res->lockname.name, freed, dead_node);

		     res->lockname.len, res->lockname.name, freed, dead_node);

		BUG_ON(!test_bit(dead_node, res->refmap));

		if(!test_bit(dead_node, res->refmap)) {

			mlog(ML_ERROR, "%s:%.*s: freed %u locks for dead node %u, "

			     "but ref was not set\n", dlm->name,

			     res->lockname.len, res->lockname.name, freed, dead_node);

			__dlm_print_one_lock_resource(res);

		}

		dlm_lockres_clear_refmap_bit(dead_node, res);

		dlm_lockres_clear_refmap_bit(dead_node, res);

	} else if (test_bit(dead_node, res->refmap)) {

	} else if (test_bit(dead_node, res->refmap)) {

		mlog(0, "%s:%.*s: dead node %u had a ref, but had "

		mlog(0, "%s:%.*s: dead node %u had a ref, but had "