dlm: fix conversion deadlock from recovery
authorDavid Teigland <teigland@redhat.com>
Tue, 5 Jun 2012 20:55:19 +0000 (15:55 -0500)
committerDavid Teigland <teigland@redhat.com>
Mon, 16 Jul 2012 19:18:22 +0000 (14:18 -0500)
commitc503a62103c46d56447f56306b52be6f844689ba
treecfc821efb8d7cd73e411d25251607428769e6e9e
parent6d768177c282637a7943e72b4b2b148e7553ecf1
dlm: fix conversion deadlock from recovery

The process of rebuilding locks on a new master during
recovery could re-order the locks on the convert queue,
creating an "in place" conversion deadlock that would
not be resolved.  Fix this by not considering queue
order when granting conversions after recovery.

Signed-off-by: David Teigland <teigland@redhat.com>
fs/dlm/lock.c
fs/dlm/recover.c