From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751098Ab0JOXdo (ORCPT ); Fri, 15 Oct 2010 19:33:44 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:40047 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750800Ab0JOXdn (ORCPT ); Fri, 15 Oct 2010 19:33:43 -0400 Date: Fri, 15 Oct 2010 16:32:27 -0700 From: Randy Dunlap To: lkml Cc: akpm , Dave Chinner , Christoph Hellwig , Alex Elder , xfs-masters@oss.sgi.com Subject: [PATCH] fs: move exportfs since it is not a networking filesystem Message-Id: <20101015163227.3edf2f42.randy.dunlap@oracle.com> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap Move the EXPORTFS kconfig symbol out of the NETWORK_FILESYSTEMS block since it provides a library function that can be (and is) used by other (non-network) filesystems. This also eliminates a kconfig dependency warning: warning: (XFS_FS && BLOCK || NFSD && NETWORK_FILESYSTEMS && INET && FILE_LOCKING && BKL) selects EXPORTFS which has unmet direct dependencies (NETWORK_FILESYSTEMS) Signed-off-by: Randy Dunlap Cc: Dave Chinner Cc: Christoph Hellwig Cc: Alex Elder Cc: xfs-masters@oss.sgi.com --- fs/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- lnx-2636-rc8.orig/fs/Kconfig +++ lnx-2636-rc8/fs/Kconfig @@ -47,6 +47,9 @@ source "fs/nilfs2/Kconfig" endif # BLOCK +config EXPORTFS + tristate + config FILE_LOCKING bool "Enable POSIX file locking API" if EMBEDDED default y @@ -221,9 +224,6 @@ config LOCKD_V4 depends on FILE_LOCKING default y -config EXPORTFS - tristate - config NFS_ACL_SUPPORT tristate select FS_POSIX_ACL