Skip to content

Commit e3e8e17

Browse files
committed
NFSD: Make FILE_SYNC WRITEs comply with spec
Mike noted that when NFSD responds to an NFS_FILE_SYNC WRITE, it does not also persist file time stamps. To wit, Section 18.32.3 of RFC 8881 mandates: > The client specifies with the stable parameter the method of how > the data is to be processed by the server. If stable is > FILE_SYNC4, the server MUST commit the data written plus all file > system metadata to stable storage before returning results. This > corresponds to the NFSv2 protocol semantics. Any other behavior > constitutes a protocol violation. If stable is DATA_SYNC4, then > the server MUST commit all of the data to stable storage and > enough of the metadata to retrieve the data before returning. Commit 3f3503a ("NFSD: Use vfs_iocb_iter_write()") replaced: - flags |= RWF_SYNC; with: + kiocb.ki_flags |= IOCB_DSYNC; which appears to be correct given: if (flags & RWF_SYNC) kiocb_flags |= IOCB_DSYNC; in kiocb_set_rw_flags(). However the author of that commit did not appreciate that the previous line in kiocb_set_rw_flags() results in IOCB_SYNC also being set: kiocb_flags |= (__force int) (flags & RWF_SUPPORTED); RWF_SUPPORTED contains RWF_SYNC, and RWF_SYNC is the same bit as IOCB_SYNC. Reviewers at the time did not catch the omission. Reported-by: Mike Snitzer <snitzer@kernel.org> Closes: https://lore.kernel.org/linux-nfs/20251018005431.3403-1-cel@kernel.org/T/#t Fixes: 3f3503a ("NFSD: Use vfs_iocb_iter_write()") Cc: stable@vger.kernel.org Reviewed-by: Jeff Layton <jlayton@kernel.org> Reviewed-by: NeilBrown <neil@brown.name> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent 99f5aa1 commit e3e8e17

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

fs/nfsd/vfs.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,8 +1314,18 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp,
13141314
stable = NFS_UNSTABLE;
13151315
init_sync_kiocb(&kiocb, file);
13161316
kiocb.ki_pos = offset;
1317-
if (stable && !fhp->fh_use_wgather)
1318-
kiocb.ki_flags |= IOCB_DSYNC;
1317+
if (likely(!fhp->fh_use_wgather)) {
1318+
switch (stable) {
1319+
case NFS_FILE_SYNC:
1320+
/* persist data and timestamps */
1321+
kiocb.ki_flags |= IOCB_DSYNC | IOCB_SYNC;
1322+
break;
1323+
case NFS_DATA_SYNC:
1324+
/* persist data only */
1325+
kiocb.ki_flags |= IOCB_DSYNC;
1326+
break;
1327+
}
1328+
}
13191329

13201330
nvecs = xdr_buf_to_bvec(rqstp->rq_bvec, rqstp->rq_maxpages, payload);
13211331
iov_iter_bvec(&iter, ITER_SOURCE, rqstp->rq_bvec, nvecs, *cnt);

0 commit comments

Comments
 (0)