diff options
| author | Michael Adam <obnox@samba.org> | 2008-01-08 11:29:09 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-01-08 11:29:09 +0100 |
| commit | 1590dd32cfccd9ce73cd798330b5207bcc48bfaf (patch) | |
| tree | 0c1336d1d9a7870bee5a8c1206a9af38856a9c74 /source3/modules | |
| parent | 9f691df852581b1ae4fab7cb9907606f4dcab291 (diff) | |
| download | samba-1590dd32cfccd9ce73cd798330b5207bcc48bfaf.tar.gz samba-1590dd32cfccd9ce73cd798330b5207bcc48bfaf.tar.bz2 samba-1590dd32cfccd9ce73cd798330b5207bcc48bfaf.zip | |
Remove redundant parameter fd from SMB_VFS_FREMOVEXATTR().
Michael
(This used to be commit bfc3b5a27f707d3e4b8d5d66192891e22365fbb3)
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_cap.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_default.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_full_audit.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c index 56ab48f9e2..ab76722f4c 100644 --- a/source3/modules/vfs_cap.c +++ b/source3/modules/vfs_cap.c @@ -420,7 +420,7 @@ static int cap_lremovexattr(vfs_handle_struct *handle, const char *path, const c return SMB_VFS_NEXT_LREMOVEXATTR(handle, cappath, capname); } -static int cap_fremovexattr(vfs_handle_struct *handle, struct files_struct *fsp,int fd, const char *path) +static int cap_fremovexattr(vfs_handle_struct *handle, struct files_struct *fsp, const char *path) { char *cappath = capencode(talloc_tos(), path); @@ -428,7 +428,7 @@ static int cap_fremovexattr(vfs_handle_struct *handle, struct files_struct *fsp, errno = ENOMEM; return -1; } - return SMB_VFS_NEXT_FREMOVEXATTR(handle, fsp, fd, cappath); + return SMB_VFS_NEXT_FREMOVEXATTR(handle, fsp, cappath); } static int cap_setxattr(vfs_handle_struct *handle, const char *path, const char *name, const void *value, size_t size, int flags) diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index b96a2d201c..fecf0562b8 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -1171,9 +1171,9 @@ static int vfswrap_lremovexattr(struct vfs_handle_struct *handle, const char *pa return sys_lremovexattr(path, name); } -static int vfswrap_fremovexattr(struct vfs_handle_struct *handle, struct files_struct *fsp,int fd, const char *name) +static int vfswrap_fremovexattr(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name) { - return sys_fremovexattr(fd, name); + return sys_fremovexattr(fsp->fh->fd, name); } static int vfswrap_setxattr(struct vfs_handle_struct *handle, const char *path, const char *name, const void *value, size_t size, int flags) diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index ecf136347c..6517c17256 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -286,7 +286,7 @@ static int smb_full_audit_lremovexattr(struct vfs_handle_struct *handle, const char *path, const char *name); static int smb_full_audit_fremovexattr(struct vfs_handle_struct *handle, - struct files_struct *fsp, int fd, + struct files_struct *fsp, const char *name); static int smb_full_audit_setxattr(struct vfs_handle_struct *handle, const char *path, @@ -2036,12 +2036,12 @@ static int smb_full_audit_lremovexattr(struct vfs_handle_struct *handle, } static int smb_full_audit_fremovexattr(struct vfs_handle_struct *handle, - struct files_struct *fsp, int fd, + struct files_struct *fsp, const char *name) { int result; - result = SMB_VFS_NEXT_FREMOVEXATTR(handle, fsp, fd, name); + result = SMB_VFS_NEXT_FREMOVEXATTR(handle, fsp, name); do_log(SMB_VFS_OP_FREMOVEXATTR, (result >= 0), handle, "%s|%s", fsp->fsp_name, name); |