summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-07 12:49:02 +0100
committerMichael Adam <obnox@samba.org>2008-01-07 15:59:01 +0100
commit8dcce0d236b2102ca94fbcb7aa7126fe6733f2e7 (patch)
tree80d5b92ffab1ea14bf2c763b797097a65fa72941 /source3/modules
parent6f657c873efa4779e762a8f9ede97e19da6fb7ec (diff)
downloadsamba-8dcce0d236b2102ca94fbcb7aa7126fe6733f2e7.tar.gz
samba-8dcce0d236b2102ca94fbcb7aa7126fe6733f2e7.tar.bz2
samba-8dcce0d236b2102ca94fbcb7aa7126fe6733f2e7.zip
Remove redundant parameter fd from SMB_VFS_FSYNC().
Michael (This used to be commit 8f83c9a7b245dbfef28195f9a7f33047a8ba95a0)
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/vfs_default.c4
-rw-r--r--source3/modules/vfs_full_audit.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 41162e67ca..8aa1709647 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -467,13 +467,13 @@ static int vfswrap_rename(vfs_handle_struct *handle, const char *oldname, const
return result;
}
-static int vfswrap_fsync(vfs_handle_struct *handle, files_struct *fsp, int fd)
+static int vfswrap_fsync(vfs_handle_struct *handle, files_struct *fsp)
{
#ifdef HAVE_FSYNC
int result;
START_PROFILE(syscall_fsync);
- result = fsync(fd);
+ result = fsync(fsp->fh->fd);
END_PROFILE(syscall_fsync);
return result;
#else
diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index b03f6b53f4..396b2bbb68 100644
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -133,7 +133,7 @@ static ssize_t smb_full_audit_recvfile(vfs_handle_struct *handle, int fromfd,
size_t n);
static int smb_full_audit_rename(vfs_handle_struct *handle,
const char *oldname, const char *newname);
-static int smb_full_audit_fsync(vfs_handle_struct *handle, files_struct *fsp, int fd);
+static int smb_full_audit_fsync(vfs_handle_struct *handle, files_struct *fsp);
static int smb_full_audit_stat(vfs_handle_struct *handle,
const char *fname, SMB_STRUCT_STAT *sbuf);
static int smb_full_audit_fstat(vfs_handle_struct *handle, files_struct *fsp, int fd,
@@ -1193,11 +1193,11 @@ static int smb_full_audit_rename(vfs_handle_struct *handle,
return result;
}
-static int smb_full_audit_fsync(vfs_handle_struct *handle, files_struct *fsp, int fd)
+static int smb_full_audit_fsync(vfs_handle_struct *handle, files_struct *fsp)
{
int result;
- result = SMB_VFS_NEXT_FSYNC(handle, fsp, fd);
+ result = SMB_VFS_NEXT_FSYNC(handle, fsp);
do_log(SMB_VFS_OP_FSYNC, (result >= 0), handle, "%s", fsp->fsp_name);