tree 10b5a55bde30bef3f466e5126bd44fc0e111fc5a
parent 17efa372cfe4d189705edf6cd4fbe283827a5dc7
author J. Bruce Fields <bfields@citi.umich.edu> 1209046102 -0400
committer J. Bruce Fields <bfields@citi.umich.edu> 1209142811 -0400

locks: don't call ->copy_lock methods on return of conflicting locks

The file_lock structure is used both as a heavy-weight representation of
an active lock, with pointers to reference-counted structures, etc., and
as a simple container for parameters that describe a file lock.

The conflicting lock returned from __posix_lock_file is an example of
the latter; so don't call the filesystem or lock manager callbacks when
copying to it.  This also saves the need for an unnecessary
locks_init_lock in the nfsv4 server.

Thanks to Trond for pointing out the error.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>