aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4state.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 9ec0ca1ef4ea..d2a052480908 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -898,7 +898,7 @@ find_unconfirmed_client_by_str(const char *dname, unsigned int hashval,
898} 898}
899 899
900static void 900static void
901gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se) 901gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se, u32 scopeid)
902{ 902{
903 struct nfs4_cb_conn *cb = &clp->cl_cb_conn; 903 struct nfs4_cb_conn *cb = &clp->cl_cb_conn;
904 unsigned short expected_family; 904 unsigned short expected_family;
@@ -921,6 +921,9 @@ gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se)
921 if (!cb->cb_addrlen || cb->cb_addr.ss_family != expected_family) 921 if (!cb->cb_addrlen || cb->cb_addr.ss_family != expected_family)
922 goto out_err; 922 goto out_err;
923 923
924 if (cb->cb_addr.ss_family == AF_INET6)
925 ((struct sockaddr_in6 *) &cb->cb_addr)->sin6_scope_id = scopeid;
926
924 cb->cb_minorversion = 0; 927 cb->cb_minorversion = 0;
925 cb->cb_prog = se->se_callback_prog; 928 cb->cb_prog = se->se_callback_prog;
926 cb->cb_ident = se->se_callback_ident; 929 cb->cb_ident = se->se_callback_ident;
@@ -1621,7 +1624,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
1621 } 1624 }
1622 copy_cred(&new->cl_cred, &rqstp->rq_cred); 1625 copy_cred(&new->cl_cred, &rqstp->rq_cred);
1623 gen_confirm(new); 1626 gen_confirm(new);
1624 gen_callback(new, setclid); 1627 gen_callback(new, setclid, rpc_get_scope_id(sa));
1625 add_to_unconfirmed(new, strhashval); 1628 add_to_unconfirmed(new, strhashval);
1626 setclid->se_clientid.cl_boot = new->cl_clientid.cl_boot; 1629 setclid->se_clientid.cl_boot = new->cl_clientid.cl_boot;
1627 setclid->se_clientid.cl_id = new->cl_clientid.cl_id; 1630 setclid->se_clientid.cl_id = new->cl_clientid.cl_id;