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

Browse source

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>

...

This commit is contained in:

J. Bruce Fields 2008-04-24 10:08:22 -04:00

parent 17efa372cf

commit 1a747ee0cc

4 changed files with 4 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

fs/lockd/svclock.c

View file

4

fs/locks.c

View file

3

fs/nfsd/nfs4state.c

View file

1

include/linux/fs.h

View file