nfsd: set the server_scope during service startup

Currently, nfsd4_encode_exchange_id() encodes the utsname nodename
string in the server_scope field.  In a multi-host container
environemnt, if an nfsd container is restarted on a different host than
it was originally running on, clients will see a server_scope mismatch
and will not attempt to reclaim opens.

Instead, set the server_scope while we're in a process context during
service startup, so we get the utsname nodename of the current process
and store that in nfsd_net.

Signed-off-by: Scott Mayhew <smayhew@redhat.com>
[bfields: fix up major_id too]
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index 2baf32311e0074c81b325cc1c0a6b1a25682494c..09aa545825bd98044753bc661f60f133228ea90d 100644 (file)
--- a/fs/nfsd/netns.h
+++ b/fs/nfsd/netns.h
@@ -172,6 +172,8 @@ struct nfsd_net {
        unsigned int             longest_chain_cachesize;
 
        struct shrinker         nfsd_reply_cache_shrinker;
+       /* utsname taken from the the process that starts the server */
+       char                    nfsd_name[UNX_MAXNODENAME+1];
 };
 
 /* Simple check to find out if a given net was properly initialized */

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 9761512674a09c8db0ff9157c53fca78b3053bda..ad38aed6f5c2dd82ec5308eca16878e2ad1e2fcc 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -4005,11 +4005,12 @@ nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, __be32 nfserr,
        int major_id_sz;
        int server_scope_sz;
        uint64_t minor_id = 0;
+       struct nfsd_net *nn = net_generic(SVC_NET(resp->rqstp), nfsd_net_id);
 
-       major_id = utsname()->nodename;
-       major_id_sz = strlen(major_id);
-       server_scope = utsname()->nodename;
-       server_scope_sz = strlen(server_scope);
+       major_id = nn->nfsd_name;
+       major_id_sz = strlen(nn->nfsd_name);
+       server_scope = nn->nfsd_name;
+       server_scope_sz = strlen(nn->nfsd_name);
 
        p = xdr_reserve_space(xdr,
                8 /* eir_clientid */ +

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 3b77b904212d8973fde5ab9baf411ea638ffba53..ca9fd348548b8ba2b904a54198139076a60c0982 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -749,6 +749,9 @@ nfsd_svc(int nrservs, struct net *net, const struct cred *cred)
        if (nrservs == 0 && nn->nfsd_serv == NULL)
                goto out;
 
+       strlcpy(nn->nfsd_name, utsname()->nodename,
+               sizeof(nn->nfsd_name));
+
        error = nfsd_create_serv(net);
        if (error)
                goto out;