From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Tue, 12 May 2009 20:28:09 +0000 (-0700)
Subject: lockd: fix FILE_LOCKING=n build error
X-Git-Tag: v2.6.31-rc1~57^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd4dc82d4c129babca9b48b219cff0add5ff4132;p=pandora-kernel.git

lockd: fix FILE_LOCKING=n build error

lockd/svclock.c is missing a header file <linux/fs.h>.

<linux/fs.h> is missing a definition of locks_release_private()
for the config case of FILE_LOCKING=n, causing a build error:

fs/lockd/svclock.c:330: error: implicit declaration of function 'locks_release_private'

lockd without FILE_LOCKING doesn't make sense, so make LOCKD and LOCKD_V4
depend on FILE_LOCKING, and make NFS depend on FILE_LOCKING.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---

Reading git-diff-tree failed