Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'nfsd-6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fixes from Chuck Lever:
"Fixes for patches merged in v6.1"
* tag 'nfsd-6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
nfsd: ensure we always call fh_verify_error tracepoint
NFSD: unregister shrinker when nfsd_init_net() fails
+4
-2
+3
-1
fs/nfsd/nfsctl.c
+3
-1
fs/nfsd/nfsctl.c
···
1458
1458
goto out_drc_error;
1459
1459
retval = nfsd_reply_cache_init(nn);
1460
1460
if (retval)
1461
-
goto out_drc_error;
1461
+
goto out_cache_error;
1462
1462
get_random_bytes(&nn->siphash_key, sizeof(nn->siphash_key));
1463
1463
seqlock_init(&nn->writeverf_lock);
1464
1464
1465
1465
return 0;
1466
1466
1467
+
out_cache_error:
1468
+
nfsd4_leases_net_shutdown(nn);
1467
1469
out_drc_error:
1468
1470
nfsd_idmap_shutdown(net);
1469
1471
out_idmap_error:
+1
-1
fs/nfsd/nfsfh.c
+1
-1
fs/nfsd/nfsfh.c
···
392
392
skip_pseudoflavor_check:
393
393
/* Finally, check access permissions. */
394
394
error = nfsd_permission(rqstp, exp, dentry, access);
395
-
trace_nfsd_fh_verify_err(rqstp, fhp, type, access, error);
396
395
out:
396
+
trace_nfsd_fh_verify_err(rqstp, fhp, type, access, error);
397
397
if (error == nfserr_stale)
398
398
nfsd_stats_fh_stale_inc(exp);
399
399
return error;