From patchwork Thu Aug 11 21:29:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 1059072 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7BLUa05023263 for ; Thu, 11 Aug 2011 21:30:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754198Ab1HKVaK (ORCPT ); Thu, 11 Aug 2011 17:30:10 -0400 Received: from natasha.panasas.com ([67.152.220.90]:36236 "EHLO natasha.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754034Ab1HKVaJ (ORCPT ); Thu, 11 Aug 2011 17:30:09 -0400 Received: from zenyatta.panasas.com (zenyatta.int.panasas.com [172.17.28.63]) by natasha.panasas.com (8.13.1/8.13.1) with ESMTP id p7BLTWe8003078; Thu, 11 Aug 2011 17:29:32 -0400 Received: from [172.17.132.75] (172.17.132.75) by zenyatta.int.panasas.com (172.17.28.63) with Microsoft SMTP Server (TLS) id 14.1.289.1; Thu, 11 Aug 2011 17:29:27 -0400 Message-ID: <4E4449B5.3050309@panasas.com> Date: Thu, 11 Aug 2011 14:29:25 -0700 From: Boaz Harrosh User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20110707 Thunderbird/5.0 MIME-Version: 1.0 To: Benny Halevy , Sorin Faibish , peter honeyman CC: , , , , , , , , "Welch, Brent" Subject: [PATCH v2] pnfs: Automatically select blocks & objects layouts References: <20110810122304.96b8be67.rdunlap@xenotime.net> <20110810175829.a834d80f.rdunlap@xenotime.net> <4E43AAD1.7090806@tonian.com> <4E4422FD.3060706@panasas.com> <4E444552.9030105@panasas.com> In-Reply-To: <4E444552.9030105@panasas.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 11 Aug 2011 21:30:37 +0000 (UTC) Just like files-layout, blocks & objects layouts are part of the NFS 4.1 protocol and should be automatically selected if NFS_4_1 is selected. The small problem is that these depend on other Kernel support being present, while files only depends on NFS itself. This patch removes from the user choice the presence of objects and blocks layout. But makes sure these are selected only if the depended subsystems are present in the Kernel. Signed-off-by: Boaz Harrosh --- fs/nfs/Kconfig | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig index 0d30613..dbcd821 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig @@ -89,24 +89,14 @@ config PNFS_FILE_LAYOUT tristate config PNFS_BLOCK - tristate "Provide support for the pNFS Block Layout Driver for NFSv4.1 pNFS (EXPERIMENTAL)" + tristate depends on NFS_FS && NFS_V4_1 && BLK_DEV_DM - help - Say M here if you want your pNFS client to support the Block Layout Driver - (RFC 5663). Requires Multiple devices driver support (DM) and Device mapper - support (BLK_DEV_DM). - - If unsure, say N. + default m config PNFS_OBJLAYOUT - tristate "Provide support for the pNFS Objects Layout Driver for NFSv4.1 pNFS (EXPERIMENTAL)" + tristate depends on NFS_FS && NFS_V4_1 && SCSI_OSD_ULD - help - Say M here if you want your pNFS client to support the Objects Layout Driver. - Requires the SCSI osd initiator library (SCSI_OSD_INITIATOR) and - upper level driver (SCSI_OSD_ULD). - - If unsure, say N. + default m config ROOT_NFS bool "Root file system on NFS"