locks: allow {vfs,posix}_lock_file to return conflicting lock
authorMarc Eshel <eshel@almaden.ibm.com>
Thu, 18 Jan 2007 21:15:35 +0000 (16:15 -0500)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Sun, 6 May 2007 23:23:24 +0000 (19:23 -0400)
commit150b393456e5a23513cace286a019e87151e47f0
tree91599ec9b759f7e3c5defcb8dd361acd7288154c
parent7723ec9777d9832849b76475b1a21a2872a40d20
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>
fs/lockd/svclock.c
fs/lockd/svcsubs.c
fs/locks.c
fs/nfsd/nfs4state.c
include/linux/fs.h