Skip to content

Commit 4367afc

Browse files
jtlaytongregkh
authored andcommitted
nfsd: reset write verifier on deferred writeback errors
commit 2090b05 upstream. nfsd_vfs_write() and nfsd_commit() both call filemap_check_wb_err() to detect deferred writeback errors, but neither rotates the server's write verifier (nn->writeverf) when this check fails. Every other durable-storage-failure path in these functions calls commit_reset_write_verifier() before returning an error. The missing rotation means clients holding UNSTABLE write data under the current verifier will COMMIT, receive the unchanged verifier back, and conclude their data is durable — silently dropping data that failed writeback. This violates the UNSTABLE+COMMIT durability contract (RFC 1813 §3.3.7, RFC 8881 §18.32). Add commit_reset_write_verifier() calls at both filemap_check_wb_err() error sites, matching the pattern used by adjacent error paths in the same functions. The helper already filters -EAGAIN and -ESTALE internally, so the calls are unconditionally safe. Reported-by: Chris Mason <clm@meta.com> Fixes: 555dbf1 ("nfsd: Replace use of rwsem with errseq_t") Cc: stable@vger.kernel.org Assisted-by: kres:claude-opus-4-6 Signed-off-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 017a615 commit 4367afc

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

fs/nfsd/vfs.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1264,8 +1264,10 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp,
12641264
nfsd_stats_io_write_add(nn, exp, *cnt);
12651265
fsnotify_modify(file);
12661266
host_err = filemap_check_wb_err(file->f_mapping, since);
1267-
if (host_err < 0)
1267+
if (host_err < 0) {
1268+
commit_reset_write_verifier(nn, rqstp, host_err);
12681269
goto out_nfserr;
1270+
}
12691271

12701272
if (stable && fhp->fh_use_wgather) {
12711273
host_err = wait_for_concurrent_writes(file);
@@ -1445,6 +1447,8 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,
14451447
nfsd_copy_write_verifier(verf, nn);
14461448
err2 = filemap_check_wb_err(nf->nf_file->f_mapping,
14471449
since);
1450+
if (err2 < 0)
1451+
commit_reset_write_verifier(nn, rqstp, err2);
14481452
err = nfserrno(err2);
14491453
break;
14501454
case -EINVAL:

0 commit comments

Comments
 (0)