[PATCH] NFS: Fix NFS KConfig typos

[PATCH] NFS: Fix NFS KConfig typos

[Anna Schumaker]

From: Anna Schumaker <anna.schumaker@oracle.com>

Two issues were noticed after the NFS v4.0 KConfig changes were merged
upstream. First, the text of CONFIG_NFS_V4 should not encourage people
to select it if they are unsure. Second, the new CONFIG_NFS_V4_0 option
should default to "on" instead of "off" to avoid breaking people's
setups if they are using NFS v4.0.

Reported-by: Niklas Cassel <cassel@kernel.org>
Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Fixes: 4e0269352534 ("NFS: Add a way to disable NFS v4.0 via KConfig")
Fixes: 7537db24806f ("NFS: Merge CONFIG_NFS_V4_1 with CONFIG_NFS_V4")
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
---
 fs/nfs/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index 12cb0ca738af..6bb30543eff0 100644
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -87,7 +87,7 @@ config NFS_V4
 	  space programs which can be found in the Linux nfs-utils package,
 	  available from http://linux-nfs.org/.
 
-	  If unsure, say Y.
+	  If unsure, say N.
 
 config NFS_SWAP
 	bool "Provide swap over NFS support"
@@ -100,6 +100,7 @@ config NFS_SWAP
 config NFS_V4_0
 	bool "NFS client support for NFSv4.0"
 	depends on NFS_V4
+	default y
 	help
 	  This option enables support for minor version 0 of the NFSv4 protocol
 	  (RFC 3530) in the kernel's NFS client.
-- 
2.53.0

Re: [PATCH] NFS: Fix NFS KConfig typos

[Dan Williams]

Anna Schumaker wrote:
> From: Anna Schumaker <anna.schumaker@oracle.com>
> 
> Two issues were noticed after the NFS v4.0 KConfig changes were merged
> upstream. First, the text of CONFIG_NFS_V4 should not encourage people
> to select it if they are unsure. Second, the new CONFIG_NFS_V4_0 option
> should default to "on" instead of "off" to avoid breaking people's
> setups if they are using NFS v4.0.
> 
> Reported-by: Niklas Cassel <cassel@kernel.org>
> Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Fixes: 4e0269352534 ("NFS: Add a way to disable NFS v4.0 via KConfig")
> Fixes: 7537db24806f ("NFS: Merge CONFIG_NFS_V4_1 with CONFIG_NFS_V4")

Can confirm that this commit, 7537db24806f, regressed my long standing
NFS boot configuration.

Can also confirm that had this proposed fix been in the tree before I
did my first post v7.0-rc1 build it would have saved me a bisect.

Unfortunately, anyone like me that did a post v7.0-rc1 build with "make
olddefconfig" will not enjoy any relief until they clean out the errant:

# CONFIG_NFS_V4_0 is not set

...so that the default can be applied.

Not sure of any good way to address that problem, but for this patch:

Tested-by: Dan Williams <dan.j.williams@intel.com>

BTW, I had to lookup this thread the old fashioned way, a
patches.msgid.link tag would have saved a few moments. No worries if
this is not standard NFS subsystem policy.