cluster/group/dlm_controld deadlock.c dlm_daemon.h

[teigland@sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland@sourceware.org	2007-08-10 20:23:08

Modified files:
	group/dlm_controld: deadlock.c dlm_daemon.h 

Log message:
	Detection and resolution now works with my basic deadlock tests.
	
	Had to rework how lock state is assembled.  The previous method was
	simpler and just gathered the master lock state from all nodes, but
	I failed to realize that the xid (transaction id) isn't synced to
	remote master copy locks.  So, now all lock state is saved in the
	checkpoints, both master-copy and process-copy (containing the xid)
	which are then merged to give the full view of the lock.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/deadlock.c.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/dlm_daemon.h.diff?cvsroot=cluster&r1=1.11&r2=1.12