Skip to contentSkip to conversation

NFSD: Fix nfsdcld warning

RFC PATCH In review [email protected] 3 participants 3 messages Jun 4, 2024

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

RFC PATCH 1/1 NFSD: Fix nfsdcld warning

From: Chuck Lever <[email protected]>

Since CONFIG_NFSD_LEGACY_CLIENT_TRACKING is a new config option, its initial default setting should have been Y (if we are to follow the common practice of "default Y, wait, default N, wait, remove code").

Paul also suggested adding a clearer remedy action to the warning message.

Message-Id: <[email protected]>

Fixes 74fd48739d04 ("nfsd: new Kconfig option for legacy client tracking")
---
 fs/nfsd/Kconfig       | 2 +-
 fs/nfsd/nfs4recover.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
fs/nfsd/Kconfig +1 -1
index 272ab8d5c4d7..ec2ab6429e00 100644
@@ -162,7 +162,7 @@ config NFSD_V4_SECURITY_LABEL
 config NFSD_LEGACY_CLIENT_TRACKING
 	bool "Support legacy NFSv4 client tracking methods (DEPRECATED)"
 	depends on NFSD_V4
-	default n
+	default y
 	help
 	  The NFSv4 server needs to store a small amount of information on
 	  stable storage in order to handle state recovery after reboot. Most
fs/nfsd/nfs4recover.c +2 -2
index 2c060e0b1604..67d8673a9391 100644
@@ -2086,8 +2086,8 @@ nfsd4_client_tracking_init(struct net *net)
 	status = nn->client_tracking_ops->init(net);
 out:
 	if (status) {
-		printk(KERN_WARNING "NFSD: Unable to initialize client "
-				    "recovery tracking! (%d)\n", status);
+		pr_warn("NFSD: Unable to initialize client recovery tracking! (%d)\n", status);
+		pr_warn("NFSD: Is nfsdcld running? If not, enable CONFIG_NFSD_LEGACY_CLIENT_TRACKING.\n");
 		nn->client_tracking_ops = NULL;
 	}
 	return status;
Signature · 1 line
2.45.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 50 lines · On Tue, 2024-06-04 at 11:24 -0400, [email protected] wrote:

From: Chuck Lever <[email protected]>

Since CONFIG_NFSD_LEGACY_CLIENT_TRACKING is a new config option, its initial default setting should have been Y (if we are to follow the common practice of "default Y, wait, default N, wait, remove code").

Paul also suggested adding a clearer remedy action to the warning message.

Message-Id: <[email protected]>

Fixes 74fd48739d04 ("nfsd: new Kconfig option for legacy client

tracking")

---
 fs/nfsd/Kconfig       | 2 +-
 fs/nfsd/nfs4recover.c | 4 ++--

 2 files changed, 3 insertions(+), 3 deletions(-)
fs/nfsd/Kconfig +0 -0
index 272ab8d5c4d7..ec2ab6429e00 100644
@@ -162,7 +162,7 @@ config NFSD_V4_SECURITY_LABEL

 config NFSD_LEGACY_CLIENT_TRACKING
  bool "Support legacy NFSv4 client tracking methods (DEPRECATED)"
  depends on NFSD_V4

fs/nfsd/Kconfig +1 -1
-	default n
+	default y

  help
    The NFSv4 server needs to store a small amount of information on
    stable storage in order to handle state recovery after reboot. Most

fs/nfsd/nfs4recover.c +0 -0
index 2c060e0b1604..67d8673a9391 100644
@@ -2086,8 +2086,8 @@ nfsd4_client_tracking_init(struct net *net)
  	status = nn->client_tracking_ops->init(net);

 out:
  if (status) {

fs/nfsd/nfs4recover.c +0 -1
-		printk(KERN_WARNING "NFSD: Unable to initialize

client "

fs/nfsd/nfs4recover.c +0 -1
-				    "recovery tracking! (%d)\n",

status);

fs/nfsd/nfs4recover.c +1 -0
+		pr_warn("NFSD: Unable to initialize client recovery

tracking! (%d)\n", status);

fs/nfsd/nfs4recover.c +1 -0
+		pr_warn("NFSD: Is nfsdcld running? If not, enable
Quoted 4 lines

CONFIG_NFSD_LEGACY_CLIENT_TRACKING.\n");
  nn->client_tracking_ops = NULL;
  }
  return status;

#2 lore raw
Quoted 49 lines · Jeff Layton
Quoted 48 lines · On Tue, 2024-06-04 at 11:24 -0400, [email protected] wrote:

From: Chuck Lever <[email protected]>

Since CONFIG_NFSD_LEGACY_CLIENT_TRACKING is a new config option, its initial default setting should have been Y (if we are to follow the common practice of "default Y, wait, default N, wait, remove code").

Paul also suggested adding a clearer remedy action to the warning message.

Message-Id: <[email protected]>

Fixes 74fd48739d04 ("nfsd: new Kconfig option for legacy client

tracking")

---
 fs/nfsd/Kconfig       | 2 +-
 fs/nfsd/nfs4recover.c | 4 ++--

 2 files changed, 3 insertions(+), 3 deletions(-)
fs/nfsd/Kconfig +0 -0
index 272ab8d5c4d7..ec2ab6429e00 100644
@@ -162,7 +162,7 @@ config NFSD_V4_SECURITY_LABEL

 config NFSD_LEGACY_CLIENT_TRACKING
  bool "Support legacy NFSv4 client tracking methods (DEPRECATED)"
  depends on NFSD_V4

fs/nfsd/Kconfig +1 -1
-	default n
+	default y

  help
    The NFSv4 server needs to store a small amount of information on
    stable storage in order to handle state recovery after reboot. Most

fs/nfsd/nfs4recover.c +0 -0
index 2c060e0b1604..67d8673a9391 100644
@@ -2086,8 +2086,8 @@ nfsd4_client_tracking_init(struct net *net)
  	status = nn->client_tracking_ops->init(net);

 out:
  if (status) {

fs/nfsd/nfs4recover.c +0 -1
-		printk(KERN_WARNING "NFSD: Unable to initialize

client "

fs/nfsd/nfs4recover.c +0 -1
-				    "recovery tracking! (%d)\n",

status);

fs/nfsd/nfs4recover.c +1 -0
+		pr_warn("NFSD: Unable to initialize client recovery
Quoted 8 lines
Quoted 6 lines

tracking! (%d)\n", status);

fs/nfsd/nfs4recover.c +1 -0
+		pr_warn("NFSD: Is nfsdcld running? If not, enable

CONFIG_NFSD_LEGACY_CLIENT_TRACKING.\n");
  nn->client_tracking_ops = NULL;
  }
  return status;

Thanks for the review! Applied to nfsd-next (for v6.11) -- the Fixes: tag should ensure that this will be pulled into v6.10 eventually.

Signature · 1 line
Chuck Lever