summaryrefslogtreecommitdiff
path: root/source3/include/vfs.h
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-07 16:38:23 +0100
committerMichael Adam <obnox@samba.org>2008-01-07 16:38:23 +0100
commitedd30e716fb5133b269ef82358e95d187a107870 (patch)
treee6697e60ec79a68b7a3761018a158aa749e9deea /source3/include/vfs.h
parent299d24dbc1d2d8eb0b78800eb5a8643b10c80274 (diff)
downloadsamba-edd30e716fb5133b269ef82358e95d187a107870.tar.gz
samba-edd30e716fb5133b269ef82358e95d187a107870.tar.bz2
samba-edd30e716fb5133b269ef82358e95d187a107870.zip
Remove redundant parameter fd from SMB_VFS_LOCK().
Michael (This used to be commit 4f3ab2c406072e0b43581057e7e785e8ad454cfa)
Diffstat (limited to 'source3/include/vfs.h')
-rw-r--r--source3/include/vfs.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index a36cd551ee..9cf49bf721 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -87,6 +87,7 @@
/* Leave at 22 - not yet released. Remove parameter fd from fchmod. - obnox */
/* Leave at 22 - not yet released. Remove parameter fd from fchown. - obnox */
/* Leave at 22 - not yet released. Remove parameter fd from ftruncate. - obnox */
+/* Leave at 22 - not yet released. Remove parameter fd from lock. - obnox */
#define SMB_VFS_INTERFACE_VERSION 22
@@ -299,7 +300,7 @@ struct vfs_ops {
char *(*getwd)(struct vfs_handle_struct *handle, char *buf);
int (*ntimes)(struct vfs_handle_struct *handle, const char *path, const struct timespec ts[2]);
int (*ftruncate)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_OFF_T offset);
- bool (*lock)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type);
+ bool (*lock)(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_OFF_T offset, SMB_OFF_T count, int type);
int (*kernel_flock)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, uint32 share_mode);
int (*linux_setlease)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, int leasetype);
bool (*getlock)(struct vfs_handle_struct *handle, struct files_struct *fsp, int fd, SMB_OFF_T *poffset, SMB_OFF_T *pcount, int *ptype, pid_t *ppid);