From patchwork Sun Jun 12 23:44:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 873332 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 p5CNhq9q007930 for ; Sun, 12 Jun 2011 23:44:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754542Ab1FLXoG (ORCPT ); Sun, 12 Jun 2011 19:44:06 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:60627 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754516Ab1FLXoF (ORCPT ); Sun, 12 Jun 2011 19:44:05 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 5909C30852E8; Sun, 12 Jun 2011 19:44:05 -0400 (EDT) X-Virus-Scanned: amavisd-new at int-mailstore01.merit.edu Received: from int-mailstore01.merit.edu ([127.0.0.1]) by localhost (int-mailstore01.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Rdy8vjUICxf3; Sun, 12 Jun 2011 19:44:04 -0400 (EDT) Received: from merit.edu (74-126-0-171.static.123.net [74.126.0.171]) by int-mailstore01.merit.edu (Postfix) with ESMTPSA id AE3C6308EFA1; Sun, 12 Jun 2011 19:44:04 -0400 (EDT) X-Mailbox-Line: From f67f031ef845429a5e3b08d662e33113f631d51c Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: Date: Sun, 12 Jun 2011 19:44:03 -0400 Subject: [PATCH 07/34] pnfsblock: define PNFS_BLOCK Kconfig option From: Jim Rees To: linux-nfs@vger.kernel.org Cc: peter honeyman 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]); Sun, 12 Jun 2011 23:44:16 +0000 (UTC) From: Fred Isaman Define a configuration variable to enable/disable compilation of the block driver code. Signed-off-by: Fred Isaman Signed-off-by: Benny Halevy [pnfs-block: fix CONFIG_PNFS_BLOCK dependencies] Signed-off-by: Benny Halevy --- fs/nfs/Kconfig | 8 ++++++++ fs/nfs/Makefile | 1 + fs/nfs/blocklayout/Makefile | 5 +++++ 3 files changed, 14 insertions(+), 0 deletions(-) create mode 100644 fs/nfs/blocklayout/Makefile diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig index 8151554..3cebf1b 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig @@ -97,6 +97,14 @@ config PNFS_OBJLAYOUT If unsure, say N. +config PNFS_BLOCK + tristate "Provide a pNFS block client (EXPERIMENTAL)" + depends on NFS_FS && PNFS + help + Say M or y here if you want your pNfs client to support the block protocol + + If unsure, say N. + config ROOT_NFS bool "Root file system on NFS" depends on NFS_FS=y && IP_PNP diff --git a/fs/nfs/Makefile b/fs/nfs/Makefile index 6a34f7d..b58613d 100644 --- a/fs/nfs/Makefile +++ b/fs/nfs/Makefile @@ -23,3 +23,4 @@ obj-$(CONFIG_PNFS_FILE_LAYOUT) += nfs_layout_nfsv41_files.o nfs_layout_nfsv41_files-y := nfs4filelayout.o nfs4filelayoutdev.o obj-$(CONFIG_PNFS_OBJLAYOUT) += objlayout/ +obj-$(CONFIG_PNFS_BLOCK) += blocklayout/ diff --git a/fs/nfs/blocklayout/Makefile b/fs/nfs/blocklayout/Makefile new file mode 100644 index 0000000..f214c1c --- /dev/null +++ b/fs/nfs/blocklayout/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the pNFS block layout driver kernel module +# +obj-$(CONFIG_PNFS_BLOCK) += +blocklayoutdriver-objs :=