nfs: fix pnfs Kconfig defaults
Subsystems (2)
PATCH 1/1 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_FS make sure they are built in for a built-in NFS and modular for a modular NFS.
--- fs/nfs/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/nfs/Kconfig +3 -3
@@ -116,17 +116,17 @@ config NFS_V4_2 config PNFS_FILE_LAYOUT tristate depends on NFS_V4_1 - default m + default NFS_FS config PNFS_BLOCK tristate depends on NFS_V4_1 && BLK_DEV_DM - default m + default NFS_FS config PNFS_OBJLAYOUT tristate depends on NFS_V4_1 && SCSI_OSD_ULD - default m + default NFS_FS config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN string "NFSv4.1 Implementation ID Domain"
Signature · 1 line
1.7.10.4
Quoted 17 lines · Christoph Hellwig
Defaulting to m seem to prevent building the pnfs layout modules into the kernel. Default to the value of
CONFIG_NFS_FSmake sure they are built in for a built-in NFS and modular for a modular NFS.Signed-off-by Christoph Hellwig <[email protected]>---
fs/nfs/Kconfig| 6 +++---1 file changed, 3 insertions(+), 3 deletions(-)fs/nfs/Kconfig +0
-0@@ -116,17 +116,17 @@ config NFS_V4_2config
PNFS_FILE_LAYOUT
tristate
depends onNFS_V4_1
fs/nfs/Kconfig
Quoted 2 lines
fs/nfs/Kconfig +1
-1- default m + default NFS_FS
Shouldn’t that really be
default NFS_V4
in order to get the dependency right? The current Kconfig does allow you to have nfs built in, while leaving NFSv4 as a module.
Quoted 6 lines · Trond
Quoted 6 lines
fs/nfs/Kconfig +0
-0@@ -116,17 +116,17 @@ config NFS_V4_2config
PNFS_FILE_LAYOUT
Quoted 8 lines
fs/nfs/Kconfig
Quoted 4 lines
tristate
depends onNFS_V4_1fs/nfs/Kconfig +1
-1- default m + default NFS_FSShouldn?t that really be
defaultNFS_V4
in order to get the dependency right? The currentKconfigdoes allow you to have nfs built in, while leaving NFSv4 as a module.
Probably should. For some reason I had NFS_V4_1 in mind as a bool.
Quoted 16 lines · Christoph Hellwig
Quoted 6 lines · Trond
Quoted 6 lines
fs/nfs/Kconfig +1
-1--- a/fs/nfs/Kconfig +-+-+- b/fs/nfs/Kconfig@@ -116,17 +-116,17 @@ config
NFS_V4_2
configPNFS_FILE_LAYOUTQuoted 8 lines
fs/nfs/Kconfig
Quoted 4 lines
tristate
depends onNFS_V4_1fs/nfs/Kconfig +1
-1- default m +- default NFS_FSShouldn?t that really be
defaultNFS_V4
in order to get the dependency right? The currentKconfigdoes allow you to have nfs built in, while leaving NFSv4 as a module.
Quoted 1 line
Probably should. For some reason I had
NFS_V4_1in mind as a bool.
NFS_V4_1 is indeed a bool, but it just defines whether or not we compile v4.1 behaviour into the 'nfsv4 module' (which is controlled by the tristate NFS_V4).
Signature · 6 lines
Trond Myklebust Linux NFS client maintainer NetApp [email protected] www.netapp.com
Quoted 5 lines · Trond
Quoted 1 line
Probably should. For some reason I had
NFS_V4_1in mind as a bool.
NFS_V4_1is indeed a bool, but it just defines whether or not we compile v4.1 behaviour into the 'nfsv4 module' (which is controlled by the tristateNFS_V4).
Oh right, nfsv4 is a module, but 4.1 is just a flavor inside it. I'll resend it after testing that it will actually work is intended.
PATCH v2 1/1 nfs: fix pnfs Kconfig defaults
In reply to Christoph HellwigDefaulting 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.
--- fs/nfs/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/nfs/Kconfig +3 -3
@@ -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"