Commit 9641d9bc authored May 14, 2022 by Trond Myklebust Committed by Anna Schumaker May 17, 2022

NFS: fsync() should report filesystem errors over EINTR/ERESTARTSYS



If the commit to disk is interrupted, we should still first check for
filesystem errors so that we can report them in preference to the error
due to the signal.

Fixes: 2197e9b0 ("NFS: Fix up fsync() when the server rebooted")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

parent cea9ba72

fs/nfs/file.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -204,15 +204,16 @@ static int
		nfs_file_fsync_commit(struct file *file, int datasync)
		{
		struct inode *inode = file_inode(file);
		int ret;
		int ret, ret2;

		dprintk("NFS: fsync file(%pD2) datasync %d\n", file, datasync);

		nfs_inc_stats(inode, NFSIOS_VFSFSYNC);
		ret = nfs_commit_inode(inode, FLUSH_SYNC);
		if (ret < 0)
		ret2 = file_check_and_advance_wb_err(file);
		if (ret2 < 0)
		return ret2;
		return ret;
		return file_check_and_advance_wb_err(file);
		}

		int