From: Christof Schmitt Date: Fri, 3 Jan 2020 19:06:40 +0000 (-0700) Subject: vfs_not_implemented: Rename argument for flock function X-Git-Tag: ldb-2.1.0~111 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=974aae418f68e7dac1e9277d8b8df4b41f0cfa8c;p=thirdparty%2Fsamba.git vfs_not_implemented: Rename argument for 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/include/vfs.h b/source3/include/vfs.h index d23cf59fe1d..e4881d4940b 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -1770,7 +1770,7 @@ bool vfs_not_implemented_lock(vfs_handle_struct *handle, files_struct *fsp, int off_t offset, off_t count, int type); int vfs_not_implemented_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 vfs_not_implemented_fcntl(struct vfs_handle_struct *handle, struct files_struct *fsp, int cmd, va_list cmd_arg); int vfs_not_implemented_linux_setlease(struct vfs_handle_struct *handle, diff --git a/source3/modules/vfs_not_implemented.c b/source3/modules/vfs_not_implemented.c index b68b9e2e8b9..dc4ac25b035 100644 --- a/source3/modules/vfs_not_implemented.c +++ b/source3/modules/vfs_not_implemented.c @@ -420,7 +420,7 @@ bool vfs_not_implemented_lock(vfs_handle_struct *handle, files_struct *fsp, int int vfs_not_implemented_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) { errno = ENOSYS; return -1;