diff options
| author |   Trond Myklebust <trondmy@gmail.com> | 2019-09-02 13:02:56 -0400 |
|---|---|---|
| committer |   J. Bruce Fields <bfields@redhat.com> | 2019-09-10 09:23:41 -0400 |
| commit | 27c438f53e79b81dc8805a81f6cd74824ba57290 (patch) | |
| tree | 58165481c4ed3f51742526143c7e4db3f273338b /fs/nfsd/nfs4proc.c | |
| parent | nfsd: nfsd_file cache entries should be per net namespace (diff) | |
| download | linux-dev-27c438f53e79b81dc8805a81f6cd74824ba57290.tar.xz linux-dev-27c438f53e79b81dc8805a81f6cd74824ba57290.zip | |
nfsd: Support the server resetting the boot verifier
Add support to allow the server to reset the boot verifier in order to
force clients to resend I/O after a timeout failure.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Lance Shelton <lance.shelton@hammerspace.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4proc.c')
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index cb51893ec1cd..4e3e77b76411 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -568,17 +568,11 @@ nfsd4_access(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, static void gen_boot_verifier(nfs4_verifier *verifier, struct net *net) { - __be32 verf[2]; - struct nfsd_net *nn = net_generic(net, nfsd_net_id); + __be32 *verf = (__be32 *)verifier->data; - /* - * This is opaque to client, so no need to byte-swap. Use - * __force to keep sparse happy. y2038 time_t overflow is - * irrelevant in this usage. - */ - verf[0] = (__force __be32)nn->nfssvc_boot.tv_sec; - verf[1] = (__force __be32)nn->nfssvc_boot.tv_nsec; - memcpy(verifier->data, verf, sizeof(verifier->data)); + BUILD_BUG_ON(2*sizeof(*verf) != sizeof(verifier->data)); + + nfsd_copy_boot_verifier(verf, net_generic(net, nfsd_net_id)); } static __be32 |