From: Jeremy Allison <jra@samba.org>
Date: Fri, 27 Apr 2018 23:59:42 +0000 (-0700)
Subject: s3: vfs: Use the new smb_vfs_fsync_sync() call in place of SMB_VFS_FSYNC().
X-Git-Tag: ldb-1.4.0~468
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf4442090e979bca1fc93d00f51b5d4fc99e59e2;p=thirdparty%2Fsamba.git

s3: vfs: Use the new smb_vfs_fsync_sync() call in place of SMB_VFS_FSYNC().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index ec6333eaa10..7b17889b55c 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -1057,7 +1057,7 @@ NTSTATUS sync_file(connection_struct *conn, files_struct *fsp, bool write_throug
 		if (ret == -1) {
 			return map_nt_error_from_unix(errno);
 		}
-		ret = SMB_VFS_FSYNC(fsp);
+		ret = smb_vfs_fsync_sync(fsp);
 		if (ret == -1) {
 			return map_nt_error_from_unix(errno);
 		}
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index 034136f3d23..3ae788e7bd9 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -640,7 +640,6 @@ static NTSTATUS cmd_rename(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
 	return NT_STATUS_OK;
 }
 
-
 static NTSTATUS cmd_fsync(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv)
 {
 	int ret, fd;
@@ -650,7 +649,7 @@ static NTSTATUS cmd_fsync(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
 	}
 
 	fd = atoi(argv[1]);
-	ret = SMB_VFS_FSYNC(vfs->files[fd]);
+	ret = smb_vfs_fsync_sync(vfs->files[fd]);
 	if (ret == -1) {
 		printf("fsync: error=%d (%s)\n", errno, strerror(errno));
 		return NT_STATUS_UNSUCCESSFUL;