From c6793afb5426d98913162bb67e350554e5500a39 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 21 May 2012 15:30:41 -0400 Subject: [PATCH] --- yaml --- r: 320200 b: refs/heads/master c: e3074507d93a0b7f1430dec7c6addb307d4f30da h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/Kconfig | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 44b5f589bbaf..bc83c726d193 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05bf14adcac188f573e22f72734fd0e2fab71aec +refs/heads/master: e3074507d93a0b7f1430dec7c6addb307d4f30da diff --git a/trunk/fs/nfs/Kconfig b/trunk/fs/nfs/Kconfig index f90f4f5cd421..404c6a8ac394 100644 --- a/trunk/fs/nfs/Kconfig +++ b/trunk/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