From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Thu, 24 Apr 2008 14:08:22 +0000 (-0400)
Subject: locks: don't call ->copy_lock methods on return of conflicting locks
X-Git-Tag: v2.6.26-rc1~1074^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a747ee0cc11a198f9e2435add821bd0dfedb7c1;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed