NFSD: Fix nfsdcld warning

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>

diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
index 272ab8d5c4d76f5a2296ed05253d23aec271956c..ec2ab6429e00ba6c181a8f97b96334951fec3370 100644 (file)
--- 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 2c060e0b1604869368651e5cf509b06351680711..67d8673a9391c7f58b713a6f7752af2ab78ef3fd 100644 (file)
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -2086,8 +2086,8 @@ do_init:
        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;