summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorAbhidnya P Chirmule <achirmul@in.ibm.com>2009-10-06 17:14:56 +0200
committerVolker Lendecke <vl@samba.org>2009-10-06 18:52:06 +0200
commitac774c49691b08fa90121d5bd008618cfd4405e7 (patch)
tree0072e321869ed910c619d65ff57c0b59ee9956d6 /source3/smbd
parentc344bf0184be484fff8bb5ed93b5c2ca6de58611 (diff)
downloadsamba-ac774c49691b08fa90121d5bd008618cfd4405e7.tar.gz
samba-ac774c49691b08fa90121d5bd008618cfd4405e7.tar.bz2
samba-ac774c49691b08fa90121d5bd008618cfd4405e7.zip
s3: Add access_mask to the flock VFS call
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/open.c2
-rw-r--r--source3/smbd/vfs.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 492164ceee..85b7d9106d 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2091,7 +2091,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
note that GPFS supports it as well - jmcd */
if (fsp->fh->fd != -1) {
- ret_flock = SMB_VFS_KERNEL_FLOCK(fsp, share_access);
+ ret_flock = SMB_VFS_KERNEL_FLOCK(fsp, share_access, access_mask);
if(ret_flock == -1 ){
TALLOC_FREE(lck);
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 966742a6d0..35e4f3f986 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1417,10 +1417,12 @@ int smb_vfs_call_ftruncate(struct vfs_handle_struct *handle,
}
int smb_vfs_call_kernel_flock(struct vfs_handle_struct *handle,
- struct files_struct *fsp, uint32 share_mode)
+ struct files_struct *fsp, uint32 share_mode,
+ uint32_t access_mask)
{
VFS_FIND(kernel_flock);
- return handle->fns->kernel_flock(handle, fsp, share_mode);
+ return handle->fns->kernel_flock(handle, fsp, share_mode,
+ access_mask);
}
int smb_vfs_call_linux_setlease(struct vfs_handle_struct *handle,