openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Scott Mayhew 2020-02-19 15:52:15 -05:00 committed by Chuck Lever
parent fb33c6510d
commit 7627d7dc79
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfsd/netns.h
View File

@ -172,6 +172,8 @@ struct nfsd_net {
unsigned int longest_chain_cachesize; unsigned int longest_chain_cachesize;
struct shrinker nfsd_reply_cache_shrinker; 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 */ /* Simple check to find out if a given net was properly initialized */

9
fs/nfsd/nfs4xdr.c
View File

@ -4005,11 +4005,12 @@ nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, __be32 nfserr,
int major_id_sz; int major_id_sz;
int server_scope_sz; int server_scope_sz;
uint64_t minor_id = 0; uint64_t minor_id = 0;
struct nfsd_net *nn = net_generic(SVC_NET(resp->rqstp), nfsd_net_id);
major_id = utsname()->nodename; major_id = nn->nfsd_name;
major_id_sz = strlen(major_id); major_id_sz = strlen(nn->nfsd_name);
server_scope = utsname()->nodename; server_scope = nn->nfsd_name;
server_scope_sz = strlen(server_scope); server_scope_sz = strlen(nn->nfsd_name);
p = xdr_reserve_space(xdr, p = xdr_reserve_space(xdr,
8 /* eir_clientid */ + 8 /* eir_clientid */ +

3
fs/nfsd/nfssvc.c
View File

@ -749,6 +749,9 @@ nfsd_svc(int nrservs, struct net *net, const struct cred *cred)
if (nrservs == 0 && nn->nfsd_serv == NULL) if (nrservs == 0 && nn->nfsd_serv == NULL)
goto out; goto out;
strlcpy(nn->nfsd_name, utsname()->nodename,
sizeof(nn->nfsd_name));
error = nfsd_create_serv(net); error = nfsd_create_serv(net);
if (error) if (error)
goto out; goto out;