pnfs: Automatically select blocks & objects layouts

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 <bharrosh@panasas.com>
Acked-by: Peng Tao <peng_tao@emc.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Boaz Harrosh 2011-08-11 14:29:25 -07:00 committed by Linus Torvalds
parent 8c20871998
commit 8cf1fb2163

View File

@ -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"