Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-1
+1
-1
fs/nfsd/nfs4state.c
+1
-1
fs/nfsd/nfs4state.c
···
1354
1354
trace_nfsd_stid_revoke(&dp->dl_stid);
1355
1355
1356
1356
if (clp->cl_minorversion) {
1357
+
spin_lock(&clp->cl_lock);
1357
1358
dp->dl_stid.sc_type = NFS4_REVOKED_DELEG_STID;
1358
1359
refcount_inc(&dp->dl_stid.sc_count);
1359
-
spin_lock(&clp->cl_lock);
1360
1360
list_add(&dp->dl_recall_lru, &clp->cl_revoked);
1361
1361
spin_unlock(&clp->cl_lock);
1362
1362
}