From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Fri, 26 Oct 2007 22:05:40 +0000 (-0400)
Subject: locks: clarify posix_locks_deadlock
X-Git-Tag: v2.6.25-rc1~1060^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b533184fc353d4a2d07929b4ac424a6f1bf5a3b9;p=pandora-kernel.git

locks: clarify posix_locks_deadlock

For such a short function (with such a long comment),
posix_locks_deadlock() seems to cause a lot of confusion.  Attempt to
make it a bit clearer:

	- Remove the initial posix_same_owner() check, which can never
	  pass (since this is only called in the case that block_fl and
	  caller_fl conflict)
	- Use an explicit loop (and a helper function) instead of a goto.
	- Rewrite the comment, attempting a clearer explanation, and
	  removing some uninteresting historical detail.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---

Reading git-diff-tree failed