Merge pull request #7713 from ukernel/wip-filelock-deadlock

author Gregory Farnum <greg@gregs42.com>

Tue, 15 Mar 2016 19:25:56 +0000 (12:25 -0700)

committer Gregory Farnum <greg@gregs42.com>

Tue, 15 Mar 2016 19:25:56 +0000 (12:25 -0700)
author Gregory Farnum <greg@gregs42.com>
Tue, 15 Mar 2016 19:25:56 +0000 (12:25 -0700)
committer Gregory Farnum <greg@gregs42.com>
Tue, 15 Mar 2016 19:25:56 +0000 (12:25 -0700)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/mds/CInode.h
Simple merge
diff --cc src/mds/Server.cc
Simple merge
author	Gregory Farnum <greg@gregs42.com>
	Tue, 15 Mar 2016 19:25:56 +0000 (12:25 -0700)
committer	Gregory Farnum <greg@gregs42.com>
	Tue, 15 Mar 2016 19:25:56 +0000 (12:25 -0700)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/CInode.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history