From patchwork Tue Jun 7 17:27:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858022 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p57HQgVU007977 for ; Tue, 7 Jun 2011 17:27:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932075Ab1FGR1H (ORCPT ); Tue, 7 Jun 2011 13:27:07 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:52922 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932074Ab1FGR1H (ORCPT ); Tue, 7 Jun 2011 13:27:07 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 03C0830852CE; Tue, 7 Jun 2011 13:27:06 -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 kYyEx-LwQSQt; Tue, 7 Jun 2011 13:27:05 -0400 (EDT) Received: from merit.edu (host-17.subnet-17.med.umich.edu [141.214.17.17]) by int-mailstore01.merit.edu (Postfix) with ESMTPSA id 93963305CF58; Tue, 7 Jun 2011 13:27:05 -0400 (EDT) Date: Tue, 7 Jun 2011 13:27:04 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 10/88] pnfsblock: define PNFS_BLOCK Kconfig option Message-ID: <6d8d3b9723e497188fbfe4603d258b3986a059d7.1307464382.git.rees@umich.edu> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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 (demeter2.kernel.org [140.211.167.43]); Tue, 07 Jun 2011 17:27:08 +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 c96f9eb..d6bfd87 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig @@ -105,6 +105,14 @@ config PNFS_PANLAYOUT 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 :=