summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-02-16 17:38:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-02-16 17:38:01 -0800
commit88fe73cb804abc3d209a06f6221a7108d89ff04f (patch)
treeb324831eb8becb9dbcb36c2cdf69417570a64375 /fs
parent55638c520bb7b92999b6f0867ba135b6aeafc8d7 (diff)
parente7afe6c1d486b516ed586dcc10b3e7e3e85a9c2b (diff)
downloadlinux-88fe73cb804abc3d209a06f6221a7108d89ff04f.tar.bz2
Merge tag 'nfsd-5.0-2' of git://linux-nfs.org/~bfields/linux
Pull more nfsd fixes from Bruce Fields: "Two small fixes, one for crashes using nfs/krb5 with older enctypes, one that could prevent clients from reclaiming state after a kernel upgrade" * tag 'nfsd-5.0-2' of git://linux-nfs.org/~bfields/linux: sunrpc: fix 4 more call sites that were using stack memory with a scatterlist Revert "nfsd4: return default lease period"
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfsctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index b33f9785b756..72a7681f4046 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1239,8 +1239,8 @@ static __net_init int nfsd_init_net(struct net *net)
retval = nfsd_idmap_init(net);
if (retval)
goto out_idmap_error;
- nn->nfsd4_lease = 45; /* default lease time */
- nn->nfsd4_grace = 45;
+ nn->nfsd4_lease = 90; /* default lease time */
+ nn->nfsd4_grace = 90;
nn->somebody_reclaimed = false;
nn->clverifier_counter = prandom_u32();
nn->clientid_counter = prandom_u32();