summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2013-11-13 17:50:33 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-11-15 19:41:43 +0100
commit8c2fabc6542d9d0f8b16bd1045c2eda59bdcde13 (patch)
tree1d2cc1b59c73db8059fc69488f67cc1391bc4222 /fs/nfs
parentNFS: correctly report misuse of "migration" mount option. (diff)
downloadlinux-8c2fabc6542d9d0f8b16bd1045c2eda59bdcde13.tar.xz
linux-8c2fabc6542d9d0f8b16bd1045c2eda59bdcde13.zip
nfs: fix pnfs Kconfig defaults
Defaulting to m seem to prevent building the pnfs layout modules into the kernel. Default to the value of CONFIG_NFS_V4 make sure they are built in for built-in NFSv4 support and modular for a modular NFSv4. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index 38c1768b4142..3dece03f2fc8 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -116,17 +116,17 @@ config NFS_V4_2
config PNFS_FILE_LAYOUT
tristate
depends on NFS_V4_1
- default m
+ default NFS_V4
config PNFS_BLOCK
tristate
depends on NFS_V4_1 && BLK_DEV_DM
- default m
+ default NFS_V4
config PNFS_OBJLAYOUT
tristate
depends on NFS_V4_1 && SCSI_OSD_ULD
- default m
+ default NFS_V4
config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
string "NFSv4.1 Implementation ID Domain"