From: Christof Schmitt Date: Fri, 3 Jan 2020 19:52:48 +0000 (-0700) Subject: vfs_time_audit: Rename argument of flock function X-Git-Tag: ldb-2.1.0~104 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00fb46c7f2f678aa601e4def2b53702d6fabf2e5;p=thirdparty%2Fsamba.git vfs_time_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_time_audit.c b/source3/modules/vfs_time_audit.c index 70efa30b914..da99a06ce3a 100644 --- a/source3/modules/vfs_time_audit.c +++ b/source3/modules/vfs_time_audit.c @@ -1281,14 +1281,15 @@ static bool smb_time_audit_lock(vfs_handle_struct *handle, files_struct *fsp, static int smb_time_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; struct timespec ts1,ts2; double timediff; clock_gettime_mono(&ts1); - result = SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode, + result = SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_access, access_mask); clock_gettime_mono(&ts2); timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;