From: Marc Eshel <eshel@almaden.ibm.com>
Date: Thu, 18 Jan 2007 21:15:35 +0000 (-0500)
Subject: locks: allow {vfs,posix}_lock_file to return conflicting lock
X-Git-Tag: v2.6.22-rc1~818^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=150b393456e5a23513cace286a019e87151e47f0;p=pandora-kernel.git

locks: allow {vfs,posix}_lock_file to return conflicting lock

The nfsv4 protocol's lock operation, in the case of a conflict, returns
information about the conflicting lock.

It's unclear how clients can use this, so for now we're not going so far as to
add a filesystem method that can return a conflicting lock, but we may as well
return something in the local case when it's easy to.

Signed-off-by: Marc Eshel <eshel@almaden.ibm.com>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
---

Reading git-diff-tree failed