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 <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 30efccbafa73e151e54c830f20a86035bef2f95f..5bf76716164da234f53581b8763505b2813a5608 100644 (file)
--- 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 ea16443a05d16071785bb018ca9256d28c82d602..415be388fcaefce4ecc0c9afe90ee4395948367e 100644 (file)
--- 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));