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.
Signed-off-by: Christoph Hellwig <[email protected]>
---
fs/nfs/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index b5e80b0..f731180 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_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"
--
1.7.10.4
On Mon, Nov 11, 2013 at 09:04:54PM +0000, Myklebust, Trond wrote:
> > Probably should. For some reason I had NFS_V4_1 in 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).
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.
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 <[email protected]>
---
fs/nfs/Kconfig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: linux/fs/nfs/Kconfig
===================================================================
--- linux.orig/fs/nfs/Kconfig 2013-11-12 18:42:14.952113008 +0100
+++ linux/fs/nfs/Kconfig 2013-11-13 17:35:24.984154196 +0100
@@ -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"
On Mon, 2013-11-11 at 13:01 -0800, Christoph Hellwig wrote:
+AD4- On Mon, Nov 11, 2013 at 08:30:48PM +-0000, Myklebust, Trond wrote:
+AD4- +AD4- +AD4- diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
+AD4- +AD4- +AD4- index b5e80b0..f731180 100644
+AD4- +AD4- +AD4- --- a/fs/nfs/Kconfig
+AD4- +AD4- +AD4- +-+-+- b/fs/nfs/Kconfig
+AD4- +AD4- +AD4- +AEAAQA- -116,17 +-116,17 +AEAAQA- config NFS+AF8-V4+AF8-2
+AD4- +AD4- +AD4- config PNFS+AF8-FILE+AF8-LAYOUT
+AD4- +AD4- +AD4- tristate
+AD4- +AD4- +AD4- depends on NFS+AF8-V4+AF8-1
+AD4- +AD4- +AD4- - default m
+AD4- +AD4- +AD4- +- default NFS+AF8-FS
+AD4- +AD4-
+AD4- +AD4- Shouldn?t that really be
+AD4- +AD4- default NFS+AF8-V4
+AD4- +AD4- in order to get the dependency right? The current Kconfig does allow you to have nfs built in, while leaving NFSv4 as a module.
+AD4-
+AD4- Probably should. For some reason I had NFS+AF8-V4+AF8-1 in mind as a bool.
NFS+AF8-V4+AF8-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+AF8-V4).
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust+AEA-netapp.com
http://www.netapp.com
On Mon, Nov 11, 2013 at 08:30:48PM +0000, Myklebust, Trond wrote:
> > diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
> > index b5e80b0..f731180 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_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.
Probably should. For some reason I had NFS_V4_1 in mind as a bool.
On Nov 2, 2013, at 6:22, Christoph Hellwig <[email protected]> wrote:
> 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.
>
> Signed-off-by: Christoph Hellwig <[email protected]>
> ---
> fs/nfs/Kconfig | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
> index b5e80b0..f731180 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_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.