From: Christof Schmitt Date: Fri, 3 Jan 2020 19:38:00 +0000 (-0700) Subject: vfs_full_audit: Rename argument of flock function X-Git-Tag: ldb-2.1.0~108 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4667399457fee5b49c931c81cb963c6771f03a8d;p=thirdparty%2Fsamba.git vfs_full_audit: Rename argument of 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 --- diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 30efccbafa7..5bf76716164 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -2587,10 +2587,10 @@ static bool vfswrap_lock(vfs_handle_struct *handle, files_struct *fsp, int op, o } static int vfswrap_kernel_flock(vfs_handle_struct *handle, files_struct *fsp, - uint32_t share_mode, uint32_t access_mask) + uint32_t share_access, uint32_t access_mask) { START_PROFILE(syscall_kernel_flock); - kernel_flock(fsp->fh->fd, share_mode, access_mask); + kernel_flock(fsp->fh->fd, share_access, access_mask); END_PROFILE(syscall_kernel_flock); return 0; } diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index ea16443a05d..415be388fca 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -1693,11 +1693,15 @@ static bool smb_full_audit_lock(vfs_handle_struct *handle, files_struct *fsp, static int smb_full_audit_kernel_flock(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 result; - result = SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode, access_mask); + result = SMB_VFS_NEXT_KERNEL_FLOCK(handle, + fsp, + share_access, + access_mask); do_log(SMB_VFS_OP_KERNEL_FLOCK, (result >= 0), handle, "%s", fsp_str_do_log(fsp));