Commit f8d6ff44 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-6.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux 

Pull nfsd fixes from Chuck Lever:
 "Two last-minute one-liners for v6.5-rc. One got lost in the shuffle,
  and the other was reported just this morning"

   - Close race window when handling FREE_STATEID operations

   - Fix regression in /proc/fs/nfsd/v4_end_grace introduced in v6.5-rc"

* tag 'nfsd-6.5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  NFSD: Fix a thinko introduced by recent trace point changes
  nfsd: Fix race to FREE_STATEID and cl_revoked
parents 0de5ec44 8073a98e

fs/nfsd/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -1354,9 +1354,9 @@ static void revoke_delegation(struct nfs4_delegation *dp) 
	trace_nfsd_stid_revoke(&dp->dl_stid);



	if (clp->cl_minorversion) {

		spin_lock(&clp->cl_lock);

		dp->dl_stid.sc_type = NFS4_REVOKED_DELEG_STID;

		refcount_inc(&dp->dl_stid.sc_count);

		spin_lock(&clp->cl_lock);

		list_add(&dp->dl_recall_lru, &clp->cl_revoked);

		spin_unlock(&clp->cl_lock);

	}

fs/nfsd/nfsctl.c

+1 −0
Original line number Diff line number Diff line
@@ -1105,6 +1105,7 @@ static ssize_t write_v4_end_grace(struct file *file, char *buf, size_t size) 
			if (!nn->nfsd_serv)

				return -EBUSY;

			trace_nfsd_end_grace(netns(file));

			nfsd4_end_grace(nn);

			break;

		default:

			return -EINVAL;