summaryrefslogtreecommitdiff
path: root/source3/include/vfs.h
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-01-07 17:14:20 +0100
committerMichael Adam <obnox@samba.org>2008-01-07 17:14:20 +0100
commit327cc04da587fa54f28dafb00267fde79b858349 (patch)
tree9c9d6b6eea2c518560ff4023d12aec908c74a1f8 /source3/include/vfs.h
parentf6cac02f00da72885e8a6d0104d099d84ac0ff6e (diff)
downloadsamba-327cc04da587fa54f28dafb00267fde79b858349.tar.gz
samba-327cc04da587fa54f28dafb00267fde79b858349.tar.bz2
samba-327cc04da587fa54f28dafb00267fde79b858349.zip
Remove redundant parameter fd from SMB_VFS_KERNEL_FLOCK().
Michael (This used to be commit 195c519377c2fdc655e25760b52bc0694b8dda81)
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 9cf49bf721..3ca602cc09 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -88,6 +88,7 @@
/* 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 */
+/* Leave at 22 - not yet released. Remove parameter fd from kernel_flock. - obnox */
#define SMB_VFS_INTERFACE_VERSION 22
@@ -301,7 +302,7 @@ struct vfs_ops {
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 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 (*kernel_flock)(struct vfs_handle_struct *handle, struct files_struct *fsp, 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);
int (*symlink)(struct vfs_handle_struct *handle, const char *oldpath, const char *newpath);