| Message ID | 20240604152359.8662-2-cel@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [RFC] NFSD: Fix nfsdcld warning | expand |
On Tue, 2024-06-04 at 11:24 -0400, cel@kernel.org wrote: > From: Chuck Lever <chuck.lever@oracle.com> > > 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") > Signed-off-by: Chuck Lever <chuck.lever@oracle.com> > --- > 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 272ab8d5c4d7..ec2ab6429e00 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 2c060e0b1604..67d8673a9391 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; Reviewed-by: Jeff Layton <jlayton@kernel.org>
On Tue, Jun 04, 2024 at 02:52:49PM -0400, Jeff Layton wrote: > On Tue, 2024-06-04 at 11:24 -0400, cel@kernel.org wrote: > > From: Chuck Lever <chuck.lever@oracle.com> > > > > 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") > > Signed-off-by: Chuck Lever <chuck.lever@oracle.com> > > --- > > 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 272ab8d5c4d7..ec2ab6429e00 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 2c060e0b1604..67d8673a9391 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; > > Reviewed-by: Jeff Layton <jlayton@kernel.org> 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.
diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig index 272ab8d5c4d7..ec2ab6429e00 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 2c060e0b1604..67d8673a9391 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;