| From 3c5f7a5513e84cf8a1fcb0899b19164dbf450025 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 4 Jun 2024 11:24:00 -0400 |
| Subject: NFSD: Fix nfsdcld warning |
| |
| From: Chuck Lever <chuck.lever@oracle.com> |
| |
| [ Upstream commit 18a5450684c312e98eb2253f0acf88b3f780af20 ] |
| |
| 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. |
| |
| Reported-by: Paul Menzel <pmenzel@molgen.mpg.de> |
| Message-Id: <d2ab4ee7-ba0f-44ac-b921-90c8fa5a04d2@molgen.mpg.de> |
| Fixes: 74fd48739d04 ("nfsd: new Kconfig option for legacy client tracking") |
| Reviewed-by: Jeff Layton <jlayton@kernel.org> |
| Signed-off-by: Chuck Lever <chuck.lever@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| fs/nfsd/Kconfig | 2 +- |
| fs/nfsd/nfs4recover.c | 4 ++-- |
| 2 files changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig |
| index 272ab8d5c4d76..ec2ab6429e00b 100644 |
| --- a/fs/nfsd/Kconfig |
| +++ b/fs/nfsd/Kconfig |
| @@ -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 |
| diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c |
| index 2c060e0b16048..67d8673a9391c 100644 |
| --- a/fs/nfsd/nfs4recover.c |
| +++ b/fs/nfsd/nfs4recover.c |
| @@ -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; |
| -- |
| 2.43.0 |
| |
