NFS: Simplify NFSv4.1 Kconfig

Convert the pNFS file layout to use the same system as the
object and block layout.
Remove unnecessary dependencies on NFS_FS

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index f90f4f5cd421dc7be9db2151ead1d8d458acf096..404c6a8ac394423da4079aa965fd987e80a0e0cc 100644 (file)
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -88,9 +88,8 @@ config NFS_V4
 
 config NFS_V4_1
        bool "NFS client support for NFSv4.1 (EXPERIMENTAL)"
-       depends on NFS_FS && NFS_V4 && EXPERIMENTAL
+       depends on NFS_V4 && EXPERIMENTAL
        select SUNRPC_BACKCHANNEL
-       select PNFS_FILE_LAYOUT
        help
          This option enables support for minor version 1 of the NFSv4 protocol
          (RFC 5661) in the kernel's NFS client.
@@ -99,15 +98,17 @@ config NFS_V4_1
 
 config PNFS_FILE_LAYOUT
        tristate
+       depends on NFS_V4_1
+       default m
 
 config PNFS_BLOCK
        tristate
-       depends on NFS_FS && NFS_V4_1 && BLK_DEV_DM
+       depends on NFS_V4_1 && BLK_DEV_DM
        default m
 
 config PNFS_OBJLAYOUT
        tristate
-       depends on NFS_FS && NFS_V4_1 && SCSI_OSD_ULD
+       depends on NFS_V4_1 && SCSI_OSD_ULD
        default m
 
 config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN