diff mbox

nfs: fix pnfs Kconfig defaults

Message ID 20131102102201.GA3860@infradead.org (mailing list archive)
State New, archived
Headers show

Commit Message

Christoph Hellwig Nov. 2, 2013, 10:22 a.m. UTC
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 <hch@lst.de>
---
 fs/nfs/Kconfig |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Trond Myklebust Nov. 11, 2013, 8:30 p.m. UTC | #1
On Nov 2, 2013, at 6:22, Christoph Hellwig <hch@infradead.org> 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 <hch@lst.de>
> ---
> 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.

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Christoph Hellwig Nov. 11, 2013, 9:01 p.m. UTC | #2
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Christoph Hellwig Nov. 11, 2013, 9:10 p.m. UTC | #3
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.

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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"