From e8d9a21435ae4266093e355feda1c9bac6f9956e Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Fri, 3 Jan 2020 12:05:57 -0700 Subject: [PATCH] vfs: Rename argument for kernel_flock function MS-SMB2 and the smbd code refer to this field as share_access. Use the same name in the function argument. Signed-off-by: Christof Schmitt Reviewed-by: Jeremy Allison --- source3/include/vfs.h | 4 ++-- source3/include/vfs_macros.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 28a3ce60543..d23cf59fe1d 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -808,7 +808,7 @@ struct vfs_fn_pointers { off_t len); bool (*lock_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, off_t offset, off_t count, int type); int (*kernel_flock_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, - uint32_t share_mode, uint32_t access_mask); + uint32_t share_access, uint32_t access_mask); int (*fcntl_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, int cmd, va_list cmd_arg); int (*linux_setlease_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, int leasetype); @@ -1338,7 +1338,7 @@ bool smb_vfs_call_lock(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, off_t offset, off_t count, int type); int smb_vfs_call_kernel_flock(struct vfs_handle_struct *handle, - struct files_struct *fsp, uint32_t share_mode, + struct files_struct *fsp, uint32_t share_access, uint32_t access_mask); int smb_vfs_call_fcntl(struct vfs_handle_struct *handle, struct files_struct *fsp, int cmd, ...); diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 6a7cbf2275d..cec8f6f204d 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -271,10 +271,10 @@ #define SMB_VFS_NEXT_LOCK(handle, fsp, op, offset, count, type) \ smb_vfs_call_lock((handle)->next, (fsp), (op), (offset), (count), (type)) -#define SMB_VFS_KERNEL_FLOCK(fsp, share_mode, access_mask) \ - smb_vfs_call_kernel_flock((fsp)->conn->vfs_handles, (fsp), (share_mode), (access_mask)) -#define SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode, access_mask) \ - smb_vfs_call_kernel_flock((handle)->next, (fsp), (share_mode), (access_mask)) +#define SMB_VFS_KERNEL_FLOCK(fsp, share_access, access_mask) \ + smb_vfs_call_kernel_flock((fsp)->conn->vfs_handles, (fsp), (share_access), (access_mask)) +#define SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_access, access_mask) \ + smb_vfs_call_kernel_flock((handle)->next, (fsp), (share_access), (access_mask)) #define SMB_VFS_FCNTL(fsp, cmd, ...) \ smb_vfs_call_fcntl((fsp)->conn->vfs_handles, (fsp), (cmd), (__VA_ARGS__)) -- 2.34.1