Commit 022c028f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ed537795 93c128e7

fs/nfsd/nfsctl.c

+3 −1
Original line number Diff line number Diff line
@@ -1458,12 +1458,14 @@ static __net_init int nfsd_init_net(struct net *net) 
		goto out_drc_error;

	retval = nfsd_reply_cache_init(nn);

	if (retval)

		goto out_drc_error;

		goto out_cache_error;

	get_random_bytes(&nn->siphash_key, sizeof(nn->siphash_key));

	seqlock_init(&nn->writeverf_lock);



	return 0;



out_cache_error:

	nfsd4_leases_net_shutdown(nn);

out_drc_error:

	nfsd_idmap_shutdown(net);

out_idmap_error:

fs/nfsd/nfsfh.c

+1 −1
Original line number Diff line number Diff line
@@ -392,8 +392,8 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, int access) 
skip_pseudoflavor_check:

	/* Finally, check access permissions. */

	error = nfsd_permission(rqstp, exp, dentry, access);

	trace_nfsd_fh_verify_err(rqstp, fhp, type, access, error);

out:

	trace_nfsd_fh_verify_err(rqstp, fhp, type, access, error);

	if (error == nfserr_stale)

		nfsd_stats_fh_stale_inc(exp);

	return error;