From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: [PATCH v2] lockd: fix FILE_LOCKING=n build error Date: Tue, 28 Apr 2009 14:01:00 -0700 Message-ID: <49F76E8C.3070808@oracle.com> References: <20090428165343.2e357d7a.sfr@canb.auug.org.au> <49F71F4A.3080908@oracle.com> <20090428172137.GA22451@fieldses.org> <49F7421A.1090709@oracle.com> <1240942554.7376.38.camel@heimdal.trondhjem.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: "J. Bruce Fields" , Stephen Rothwell , linux-next@vger.kernel.org, LKML , Andrew Morton , Matthew Wilcox , linux-fsdevel To: Trond Myklebust Return-path: Received: from acsinet12.oracle.com ([141.146.126.234]:61467 "EHLO acsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752985AbZD1VAr (ORCPT ); Tue, 28 Apr 2009 17:00:47 -0400 In-Reply-To: <1240942554.7376.38.camel@heimdal.trondhjem.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Trond Myklebust wrote: > Until someone finds time to go through the code and add in all the > CONFIG_FILE_LOCKING special cases, the above needs to be a 'depends on > INET && FILE_LOCKING'. That seems to work. Thanks. From: Randy Dunlap 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 --- fs/Kconfig | 2 ++ fs/nfs/Kconfig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) --- linux-next-20090428.orig/fs/Kconfig +++ linux-next-20090428/fs/Kconfig @@ -226,10 +226,12 @@ source "fs/nfsd/Kconfig" config LOCKD tristate + depends on FILE_LOCKING config LOCKD_V4 bool depends on NFSD_V3 || NFS_V3 + depends on FILE_LOCKING default y config EXPORTFS --- linux-next-20090428.orig/fs/nfs/Kconfig +++ linux-next-20090428/fs/nfs/Kconfig @@ -1,6 +1,6 @@ config NFS_FS tristate "NFS client support" - depends on INET + depends on INET && FILE_LOCKING select LOCKD select SUNRPC select NFS_ACL_SUPPORT if NFS_V3_ACL