Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'nfsd-6.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fix from Chuck Lever:
- One more write delegation fix
* tag 'nfsd-6.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
nfsd: fix nfsd4_deleg_getattr_conflict in presence of third party lease
+9
-2
+9
-2
fs/nfsd/nfs4state.c
+9
-2
fs/nfsd/nfs4state.c
···
8859
8859
*/
8860
8860
if (type == F_RDLCK)
8861
8861
break;
8862
-
goto break_lease;
8862
+
8863
+
nfsd_stats_wdeleg_getattr_inc(nn);
8864
+
spin_unlock(&ctx->flc_lock);
8865
+
8866
+
status = nfserrno(nfsd_open_break_lease(inode, NFSD_MAY_READ));
8867
+
if (status != nfserr_jukebox ||
8868
+
!nfsd_wait_for_delegreturn(rqstp, inode))
8869
+
return status;
8870
+
return 0;
8863
8871
}
8864
8872
if (type == F_WRLCK) {
8865
8873
struct nfs4_delegation *dp = fl->c.flc_owner;
···
8876
8868
spin_unlock(&ctx->flc_lock);
8877
8869
return 0;
8878
8870
}
8879
-
break_lease:
8880
8871
nfsd_stats_wdeleg_getattr_inc(nn);
8881
8872
dp = fl->c.flc_owner;
8882
8873
refcount_inc(&dp->dl_stid.sc_count);