The branch, master has been updated
via e50083ceb80 smbd: Update debug messages for failed sharemode release
via 0a2b5011459 smbd: Remove return variable for releasing filesystem
sharemode
via fa3f952f3e7 smbd: Rename return variable for requesting filesystem
sharemode
via d8972d92010 smbd: Update comment for durable handles
via 113f6964d01 VFS: Update tracking documents for renamed function
via 041dfdfc131 vfs_catia: Rename kernel_flock to filesystem_sharemode
via 3224eb8fcf7 vfs_default: Rename kernel_flock to filesystem_sharemode
via 4209e42ab1b vfs_streams_xattr: Rename kernel_flock to
filesystem_sharemode
via b63ee5c7391 vfs_gpfs: Rename kernel_flock to filesystem_sharemode
via 272fce3cbd5 vfs_time_audit: Fix message for fcntl VFS call
via f3bd312ad97 vfs_time_audit: Rename kernel_flock to
filesystem_sharemode
via 0bd1df93fc3 vfs_glusterfs: Rename kernel_flock to
filesystem_sharemode
via 0ac9dfd2677 vfs_ceph: Rename kernel_flock to filesystem_sharemode
via 73f04003e3e docs-xml: Update vfs_full_audit manpage for renamed
function
via ad87998ab40 vfs_full_audit: Rename kernel_flock to
filesystem_sharemode
via 264440c983a s3: Remove definition of removed kernel_flock function
via 0ae59ffc499 examples/VFS/skel_opaque: Rename kernel_flock to
filesystem_sharemode
via a2578d9b564 examples/VFS/skel_transparent: Rename kernel_flock to
filesystem_sharemode
via 0a26b2386e3 VFS: Increase VFS version for renamed function
via c794e773814 VFS: Rename kernel_flock to filesystem_sharemode
via f3b5733df76 profile: Remove syscall_kernel_flock profiling
from af06d73a756 s3:rpc_server: Do not use the default ncalrpc endpoint
for external services
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e50083ceb8013288d506ba9224f65deb5e3a38a5
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:55:32 2021 -0700
smbd: Update debug messages for failed sharemode release
Use new macros, consistent log level and remove reference to flock.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Christof Schmitt <c...@samba.org>
Autobuild-Date(master): Tue Sep 21 19:39:10 UTC 2021 on sn-devel-184
commit 0a2b50114599ed609778eb5add9a9c18126d07a4
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:50:08 2021 -0700
smbd: Remove return variable for releasing filesystem sharemode
flock is no longer used, the existing "ret" variable can be used
instead.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit fa3f952f3e7d27a0977f497ce96ef8484c2f1111
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:46:21 2021 -0700
smbd: Rename return variable for requesting filesystem sharemode
flock is no longer used, rename the variable accordingly.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit d8972d920106043c8b0a24482174009d68f6faf8
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:38:59 2021 -0700
smbd: Update comment for durable handles
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 113f6964d0168c21dc94aa594f728c175fc294df
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:29:22 2021 -0700
VFS: Update tracking documents for renamed function
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 041dfdfc131e92e6947325a78180d83909e81b8e
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:27:07 2021 -0700
vfs_catia: Rename kernel_flock to filesystem_sharemode
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 3224eb8fcf79b5f2554a6195aeeb313dd25c2de5
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:26:19 2021 -0700
vfs_default: Rename kernel_flock to filesystem_sharemode
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 4209e42ab1b07753c6130a25b52a48bada4d90e9
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:25:21 2021 -0700
vfs_streams_xattr: Rename kernel_flock to filesystem_sharemode
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit b63ee5c7391ce683eed46e68a1e2dd47c2b14fd7
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:24:33 2021 -0700
vfs_gpfs: Rename kernel_flock to filesystem_sharemode
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 272fce3cbd5114c190570e4565f8e2f7b16ea3d4
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:22:50 2021 -0700
vfs_time_audit: Fix message for fcntl VFS call
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit f3bd312ad97521df5f78d784a6abf7b82bc37a90
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:22:06 2021 -0700
vfs_time_audit: Rename kernel_flock to filesystem_sharemode
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 0bd1df93fc331123e377775815337c98e5ebe1e8
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:20:42 2021 -0700
vfs_glusterfs: Rename kernel_flock to filesystem_sharemode
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 0ac9dfd2677392f1e5d292752b046fb025679a5f
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:18:56 2021 -0700
vfs_ceph: Rename kernel_flock to filesystem_sharemode
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 73f04003e3e7c587c9be7cbd58a10fdd059f50ab
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:17:16 2021 -0700
docs-xml: Update vfs_full_audit manpage for renamed function
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit ad87998ab405bd87a9bad9019e9f09819cb38681
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 15:15:39 2021 -0700
vfs_full_audit: Rename kernel_flock to filesystem_sharemode
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 264440c983a25f9043f2801e2fb6082b24990a88
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 14:58:23 2021 -0700
s3: Remove definition of removed kernel_flock function
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 0ae59ffc4992821e6242f0a21235bf7514d94786
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 14:57:07 2021 -0700
examples/VFS/skel_opaque: Rename kernel_flock to filesystem_sharemode
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit a2578d9b5642f639cf7016b43e71957478213b76
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 14:56:08 2021 -0700
examples/VFS/skel_transparent: Rename kernel_flock to filesystem_sharemode
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 0a26b2386e3fedd5d90e3c0197b31ed31b286699
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 14:53:59 2021 -0700
VFS: Increase VFS version for renamed function
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit c794e77381477f4a3d5e96c5100cfbf0b1804c52
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 14:51:02 2021 -0700
VFS: Rename kernel_flock to filesystem_sharemode
With the removal of the call to flock LOCK_MAND, the only remaining use
of this VFS path is to register sharemodes with specific file systems.
Rename the VFS call to reflect that this is no longer related to flock.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit f3b5733df7637ad0c6d4bb42378ae430a35cc633
Author: Christof Schmitt <c...@samba.org>
Date: Mon Sep 20 13:46:18 2021 -0700
profile: Remove syscall_kernel_flock profiling
This no longer calls flock, so it should not be part of the system call
profiling.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/vfs_full_audit.8.xml | 2 +-
examples/VFS/skel_opaque.c | 9 +++++----
examples/VFS/skel_transparent.c | 14 +++++++++-----
source3/include/proto.h | 1 -
source3/include/smbprofile.h | 1 -
source3/include/vfs.h | 23 ++++++++++++++---------
source3/include/vfs_macros.h | 15 +++++++++++----
source3/modules/The_New_VFS.org | 4 ++--
source3/modules/The_New_VFS.txt | 4 ++--
source3/modules/vfs_catia.c | 15 +++++++++------
source3/modules/vfs_ceph.c | 12 ++++++------
source3/modules/vfs_default.c | 8 +++++---
source3/modules/vfs_full_audit.c | 24 ++++++++++++------------
source3/modules/vfs_glusterfs.c | 9 +++++----
source3/modules/vfs_gpfs.c | 12 +++++-------
source3/modules/vfs_not_implemented.c | 9 +++++----
source3/modules/vfs_streams_xattr.c | 16 +++++++++-------
source3/modules/vfs_time_audit.c | 20 +++++++++++---------
source3/smbd/close.c | 23 ++++++++++-------------
source3/smbd/durable.c | 2 +-
source3/smbd/open.c | 9 +++++----
source3/smbd/vfs.c | 17 ++++++++++-------
22 files changed, 137 insertions(+), 112 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/vfs_full_audit.8.xml
b/docs-xml/manpages/vfs_full_audit.8.xml
index 10c96fd20e3..fc08845ac3c 100644
--- a/docs-xml/manpages/vfs_full_audit.8.xml
+++ b/docs-xml/manpages/vfs_full_audit.8.xml
@@ -93,7 +93,7 @@
<member>getxattrat_recv</member>
<member>getxattrat_send</member>
<member>is_offline</member>
- <member>kernel_flock</member>
+ <member>filesystem_sharemode</member>
<member>lchown</member>
<member>linkat</member>
<member>linux_setlease</member>
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 25241feeb26..f393332c681 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -428,9 +428,10 @@ static bool skel_lock(vfs_handle_struct *handle,
files_struct *fsp, int op,
return false;
}
-static int skel_kernel_flock(struct vfs_handle_struct *handle,
- struct files_struct *fsp,
- uint32_t share_mode, uint32_t access_mask)
+static int skel_filesystem_sharemode(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
+ uint32_t share_mode,
+ uint32_t access_mask)
{
errno = ENOSYS;
return -1;
@@ -1009,7 +1010,7 @@ static struct vfs_fn_pointers skel_opaque_fns = {
.ftruncate_fn = skel_ftruncate,
.fallocate_fn = skel_fallocate,
.lock_fn = skel_lock,
- .kernel_flock_fn = skel_kernel_flock,
+ .filesystem_sharemode_fn = skel_filesystem_sharemode,
.fcntl_fn = skel_fcntl,
.linux_setlease_fn = skel_linux_setlease,
.getlock_fn = skel_getlock,
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 77121259550..d6bf3171b95 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -548,11 +548,15 @@ static bool skel_lock(vfs_handle_struct *handle,
files_struct *fsp, int op,
return SMB_VFS_NEXT_LOCK(handle, fsp, op, offset, count, type);
}
-static int skel_kernel_flock(struct vfs_handle_struct *handle,
- struct files_struct *fsp, uint32_t share_mode,
- uint32_t access_mask)
+static int skel_filesystem_sharemode(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
+ uint32_t share_mode,
+ uint32_t access_mask)
{
- return SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode, access_mask);
+ return SMB_VFS_NEXT_FILESYSTEM_SHAREMODE(handle,
+ fsp,
+ share_mode,
+ access_mask);
}
static int skel_fcntl(struct vfs_handle_struct *handle,
@@ -1315,7 +1319,7 @@ static struct vfs_fn_pointers skel_transparent_fns = {
.ftruncate_fn = skel_ftruncate,
.fallocate_fn = skel_fallocate,
.lock_fn = skel_lock,
- .kernel_flock_fn = skel_kernel_flock,
+ .filesystem_sharemode_fn = skel_filesystem_sharemode,
.fcntl_fn = skel_fcntl,
.linux_setlease_fn = skel_linux_setlease,
.getlock_fn = skel_getlock,
diff --git a/source3/include/proto.h b/source3/include/proto.h
index ba4e5f74f44..c136db63b38 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -221,7 +221,6 @@ int sys_fstatat(int fd,
bool fake_dir_create_times);
int sys_posix_fallocate(int fd, off_t offset, off_t len);
int sys_fallocate(int fd, uint32_t mode, off_t offset, off_t len);
-void kernel_flock(int fd, uint32_t share_access, uint32_t access_mask);
DIR *sys_fdopendir(int fd);
int sys_mknod(const char *path, mode_t mode, SMB_DEV_T dev);
int sys_mknodat(int dirfd, const char *path, mode_t mode, SMB_DEV_T dev);
diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h
index 1bb429778c4..3ddd4eb6f5d 100644
--- a/source3/include/smbprofile.h
+++ b/source3/include/smbprofile.h
@@ -78,7 +78,6 @@ struct tevent_context;
SMBPROFILE_STATS_BASIC(syscall_ftruncate) \
SMBPROFILE_STATS_BASIC(syscall_fallocate) \
SMBPROFILE_STATS_BASIC(syscall_fcntl_lock) \
- SMBPROFILE_STATS_BASIC(syscall_kernel_flock) \
SMBPROFILE_STATS_BASIC(syscall_fcntl) \
SMBPROFILE_STATS_BASIC(syscall_linux_setlease) \
SMBPROFILE_STATS_BASIC(syscall_fcntl_getlock) \
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index ee6e48a62d1..be7d47db957 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -360,9 +360,10 @@
* Version 45 - Remove SYS_ACL_BLOB_GET_FILE
* Version 45 - Add SMB_VFS_FCHFLAGS
* Version 45 - Remove SMB_VFS_GETXATTR
+ * Version 46 - Rename SMB_VFS_KERNEL_FLOCK to SMB_VFS_FILESYSTEM_SHAREMODE
*/
-#define SMB_VFS_INTERFACE_VERSION 45
+#define SMB_VFS_INTERFACE_VERSION 46
/*
All intercepted VFS operations must be declared as static functions inside
module source
@@ -1039,8 +1040,10 @@ struct vfs_fn_pointers {
off_t offset,
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_access, uint32_t access_mask);
+ int (*filesystem_sharemode_fn)(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
+ 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);
@@ -1543,9 +1546,10 @@ int smb_vfs_call_fallocate(struct vfs_handle_struct
*handle,
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_access,
- uint32_t access_mask);
+int smb_vfs_call_filesystem_sharemode(struct vfs_handle_struct *handle,
+ 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, ...);
int smb_vfs_call_linux_setlease(struct vfs_handle_struct *handle,
@@ -1964,9 +1968,10 @@ int vfs_not_implemented_fallocate(vfs_handle_struct
*handle, files_struct *fsp,
uint32_t mode, off_t offset, off_t len);
bool vfs_not_implemented_lock(vfs_handle_struct *handle, files_struct *fsp,
int op,
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_access, uint32_t
access_mask);
+int vfs_not_implemented_filesystem_sharemode(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
+ 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/include/vfs_macros.h b/source3/include/vfs_macros.h
index c20db416b54..2ab5b4b56cc 100644
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -283,10 +283,17 @@
#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_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_FILESYSTEM_SHAREMODE(fsp, share_access, access_mask) \
+ smb_vfs_call_filesystem_sharemode((fsp)->conn->vfs_handles, \
+ (fsp), \
+ (share_access), \
+ (access_mask))
+#define SMB_VFS_NEXT_FILESYSTEM_SHAREMODE(handle, fsp, share_access, \
+ access_mask) \
+ smb_vfs_call_filesystem_sharemode((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__))
diff --git a/source3/modules/The_New_VFS.org b/source3/modules/The_New_VFS.org
index 8ad842d113f..6309986a519 100644
--- a/source3/modules/The_New_VFS.org
+++ b/source3/modules/The_New_VFS.org
@@ -250,7 +250,7 @@ whenever VFS access is done in a piecemeal fashion.
| SMB_VFS_GETXATTR() | [[Path][Path]] | - |
| SMB_VFS_GETXATTRAT_RECV() | [[Enum][Enum]] | - |
| SMB_VFS_GETXATTRAT_SEND() | [[Enum][Enum]] | - |
-| SMB_VFS_KERNEL_FLOCK() | [[fsp][fsp]] | - |
+| SMB_VFS_FILESYSTEM_SHAREMODE() | [[fsp][fsp]] | - |
| SMB_VFS_LCHOWN() | [[Path][Path]] | Todo |
| SMB_VFS_LINKAT() | [[NsC][NsC]] | - |
| SMB_VFS_LINUX_SETLEASE() | [[fsp][fsp]] | - |
@@ -350,7 +350,7 @@ whenever VFS access is done in a piecemeal fashion.
- SMB_VFS_GETLOCK()
- SMB_VFS_GET_ALLOC_SIZE()
- SMB_VFS_GET_SHADOW_COPY_DATA()
- - SMB_VFS_KERNEL_FLOCK()
+ - SMB_VFS_FILESYSTEM_SHAREMODE()
- SMB_VFS_LINUX_SETLEASE()
- SMB_VFS_LOCK()
- SMB_VFS_LSEEK()
diff --git a/source3/modules/The_New_VFS.txt b/source3/modules/The_New_VFS.txt
index 4680a3f8055..7988639d4a4 100644
--- a/source3/modules/The_New_VFS.txt
+++ b/source3/modules/The_New_VFS.txt
@@ -318,7 +318,7 @@ Table of Contents
SMB_VFS_GETXATTR() [Path] -
SMB_VFS_GETXATTRAT_RECV() [Enum] -
SMB_VFS_GETXATTRAT_SEND() [Enum] -
- SMB_VFS_KERNEL_FLOCK() [fsp] -
+ SMB_VFS_FILESYSTEM_SHAREMODE() [fsp] -
SMB_VFS_LCHOWN() [Path] Todo
SMB_VFS_LINKAT() [NsC] -
SMB_VFS_LINUX_SETLEASE() [fsp] -
@@ -456,7 +456,7 @@ Table of Contents
• SMB_VFS_GETLOCK()
• SMB_VFS_GET_ALLOC_SIZE()
• SMB_VFS_GET_SHADOW_COPY_DATA()
- • SMB_VFS_KERNEL_FLOCK()
+ • SMB_VFS_FILESYSTEM_SHAREMODE()
• SMB_VFS_LINUX_SETLEASE()
• SMB_VFS_LOCK()
• SMB_VFS_LSEEK()
diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index ce5a91c9f10..c4d0e4dd7d8 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -1611,10 +1611,10 @@ static bool catia_lock(vfs_handle_struct *handle,
return ok;
}
-static int catia_kernel_flock(struct vfs_handle_struct *handle,
- struct files_struct *fsp,
- uint32_t share_access,
- uint32_t access_mask)
+static int catia_filesystem_sharemode(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
+ uint32_t share_access,
+ uint32_t access_mask)
{
struct catia_cache *cc = NULL;
int ret;
@@ -1624,7 +1624,10 @@ static int catia_kernel_flock(struct vfs_handle_struct
*handle,
return -1;
}
- ret = SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_access, access_mask);
+ ret = SMB_VFS_NEXT_FILESYSTEM_SHAREMODE(handle,
+ fsp,
+ share_access,
+ access_mask);
CATIA_FETCH_FSP_POST_NEXT(&cc, fsp);
@@ -1892,7 +1895,7 @@ static struct vfs_fn_pointers vfs_catia_fns = {
.ftruncate_fn = catia_ftruncate,
.fallocate_fn = catia_fallocate,
.lock_fn = catia_lock,
- .kernel_flock_fn = catia_kernel_flock,
+ .filesystem_sharemode_fn = catia_filesystem_sharemode,
.linux_setlease_fn = catia_linux_setlease,
.getlock_fn = catia_getlock,
.realpath_fn = catia_realpath,
diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index 3f55d724143..4e1fa6a2df4 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -1045,12 +1045,12 @@ static bool cephwrap_lock(struct vfs_handle_struct
*handle, files_struct *fsp, i
return true;
}
-static int cephwrap_kernel_flock(struct vfs_handle_struct *handle,
- files_struct *fsp,
- uint32_t share_access,
- uint32_t access_mask)
+static int cephwrap_filesystem_sharemode(struct vfs_handle_struct *handle,
+ files_struct *fsp,
+ uint32_t share_access,
+ uint32_t access_mask)
{
- DBG_ERR("[CEPH] flock unsupported! Consider setting "
+ DBG_ERR("[CEPH] filesystem sharemodes unsupported! Consider setting "
"\"kernel share modes = no\"\n");
errno = ENOSYS;
@@ -1628,7 +1628,7 @@ static struct vfs_fn_pointers ceph_fns = {
.ftruncate_fn = cephwrap_ftruncate,
.fallocate_fn = cephwrap_fallocate,
.lock_fn = cephwrap_lock,
- .kernel_flock_fn = cephwrap_kernel_flock,
+ .filesystem_sharemode_fn = cephwrap_filesystem_sharemode,
.fcntl_fn = cephwrap_fcntl,
.linux_setlease_fn = cephwrap_linux_setlease,
.getlock_fn = cephwrap_getlock,
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 2687d175880..37e9721c72b 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -3015,8 +3015,10 @@ static bool vfswrap_lock(vfs_handle_struct *handle,
files_struct *fsp, int op, o
return result;
}
-static int vfswrap_kernel_flock(vfs_handle_struct *handle, files_struct *fsp,
- uint32_t share_access, uint32_t access_mask)
+static int vfswrap_filesystem_sharemode(vfs_handle_struct *handle,
+ files_struct *fsp,
+ uint32_t share_access,
+ uint32_t access_mask)
{
errno = ENOTSUP;
return -1;
@@ -3970,7 +3972,7 @@ static struct vfs_fn_pointers vfs_default_fns = {
.ftruncate_fn = vfswrap_ftruncate,
.fallocate_fn = vfswrap_fallocate,
.lock_fn = vfswrap_lock,
- .kernel_flock_fn = vfswrap_kernel_flock,
+ .filesystem_sharemode_fn = vfswrap_filesystem_sharemode,
.fcntl_fn = vfswrap_fcntl,
.linux_setlease_fn = vfswrap_linux_setlease,
.getlock_fn = vfswrap_getlock,
diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index ceda99d4568..3852d729d86 100644
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -151,7 +151,7 @@ typedef enum _vfs_op_type {
SMB_VFS_OP_FTRUNCATE,
SMB_VFS_OP_FALLOCATE,
SMB_VFS_OP_LOCK,
- SMB_VFS_OP_KERNEL_FLOCK,
+ SMB_VFS_OP_FILESYSTEM_SHAREMODE,
SMB_VFS_OP_FCNTL,
SMB_VFS_OP_LINUX_SETLEASE,
SMB_VFS_OP_GETLOCK,
@@ -287,7 +287,7 @@ static struct {
{ SMB_VFS_OP_FTRUNCATE, "ftruncate" },
{ SMB_VFS_OP_FALLOCATE,"fallocate" },
{ SMB_VFS_OP_LOCK, "lock" },
- { SMB_VFS_OP_KERNEL_FLOCK, "kernel_flock" },
+ { SMB_VFS_OP_FILESYSTEM_SHAREMODE, "filesystem_sharemode" },
{ SMB_VFS_OP_FCNTL, "fcntl" },
{ SMB_VFS_OP_LINUX_SETLEASE, "linux_setlease" },
{ SMB_VFS_OP_GETLOCK, "getlock" },
@@ -1767,19 +1767,19 @@ static bool smb_full_audit_lock(vfs_handle_struct
*handle, files_struct *fsp,
return result;
}
-static int smb_full_audit_kernel_flock(struct vfs_handle_struct *handle,
- struct files_struct *fsp,
- uint32_t share_access,
- uint32_t access_mask)
+static int smb_full_audit_filesystem_sharemode(struct vfs_handle_struct
*handle,
+ struct files_struct *fsp,
+ uint32_t share_access,
+ uint32_t access_mask)
{
int result;
- result = SMB_VFS_NEXT_KERNEL_FLOCK(handle,
- fsp,
- share_access,
- access_mask);
+ result = SMB_VFS_NEXT_FILESYSTEM_SHAREMODE(handle,
+ fsp,
+ share_access,
+ access_mask);
- do_log(SMB_VFS_OP_KERNEL_FLOCK, (result >= 0), handle, "%s",
+ do_log(SMB_VFS_OP_FILESYSTEM_SHAREMODE, (result >= 0), handle, "%s",
fsp_str_do_log(fsp));
return result;
@@ -2938,7 +2938,7 @@ static struct vfs_fn_pointers vfs_full_audit_fns = {
.ftruncate_fn = smb_full_audit_ftruncate,
.fallocate_fn = smb_full_audit_fallocate,
.lock_fn = smb_full_audit_lock,
- .kernel_flock_fn = smb_full_audit_kernel_flock,
+ .filesystem_sharemode_fn = smb_full_audit_filesystem_sharemode,
.fcntl_fn = smb_full_audit_fcntl,
.linux_setlease_fn = smb_full_audit_linux_setlease,
.getlock_fn = smb_full_audit_getlock,
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index c9736459cf5..25b82bdd471 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -1787,9 +1787,10 @@ out:
return ok;
}
-static int vfs_gluster_kernel_flock(struct vfs_handle_struct *handle,
- files_struct *fsp, uint32_t share_access,
- uint32_t access_mask)
+static int vfs_gluster_filesystem_sharemode(struct vfs_handle_struct *handle,
+ files_struct *fsp,
+ uint32_t share_access,
+ uint32_t access_mask)
{
errno = ENOSYS;
return -1;
@@ -2362,7 +2363,7 @@ static struct vfs_fn_pointers glusterfs_fns = {
.ftruncate_fn = vfs_gluster_ftruncate,
.fallocate_fn = vfs_gluster_fallocate,
.lock_fn = vfs_gluster_lock,
- .kernel_flock_fn = vfs_gluster_kernel_flock,
+ .filesystem_sharemode_fn = vfs_gluster_filesystem_sharemode,
.fcntl_fn = vfs_gluster_fcntl,
.linux_setlease_fn = vfs_gluster_linux_setlease,
.getlock_fn = vfs_gluster_getlock,
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 0225cdc6e0f..f6f162b3b57 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -156,15 +156,15 @@ static int set_gpfs_sharemode(files_struct *fsp, uint32_t
access_mask,
return result;
}
-static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle, files_struct *fsp,
- uint32_t share_access, uint32_t access_mask)
+static int vfs_gpfs_filesystem_sharemode(vfs_handle_struct *handle,
+ files_struct *fsp,
+ uint32_t share_access,
+ uint32_t access_mask)
{
struct gpfs_config_data *config;
int ret = 0;
- START_PROFILE(syscall_kernel_flock);
-
SMB_VFS_HANDLE_GET_DATA(handle, config,
struct gpfs_config_data,
return -1);
@@ -187,8 +187,6 @@ static int vfs_gpfs_kernel_flock(vfs_handle_struct *handle,
files_struct *fsp,
ret = set_gpfs_sharemode(fsp, access_mask, share_access);
- END_PROFILE(syscall_kernel_flock);
-
return ret;
}
@@ -2584,7 +2582,7 @@ static struct vfs_fn_pointers vfs_gpfs_fns = {
.disk_free_fn = vfs_gpfs_disk_free,
.get_quota_fn = vfs_gpfs_get_quota,
.fs_capabilities_fn = vfs_gpfs_capabilities,
- .kernel_flock_fn = vfs_gpfs_kernel_flock,
+ .filesystem_sharemode_fn = vfs_gpfs_filesystem_sharemode,
.linux_setlease_fn = vfs_gpfs_setlease,
.get_real_filename_fn = vfs_gpfs_get_real_filename,
.get_dos_attributes_send_fn =
vfs_not_implemented_get_dos_attributes_send,
diff --git a/source3/modules/vfs_not_implemented.c
b/source3/modules/vfs_not_implemented.c
index 387c06c3587..41f16869b37 100644
--- a/source3/modules/vfs_not_implemented.c
+++ b/source3/modules/vfs_not_implemented.c
@@ -425,9 +425,10 @@ bool vfs_not_implemented_lock(vfs_handle_struct *handle,
files_struct *fsp, int
return false;
}
-int vfs_not_implemented_kernel_flock(struct vfs_handle_struct *handle,
- struct files_struct *fsp,
- uint32_t share_access, uint32_t
access_mask)
+int vfs_not_implemented_filesystem_sharemode(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
+ uint32_t share_access,
+ uint32_t access_mask)
{
errno = ENOSYS;
return -1;
@@ -1013,7 +1014,7 @@ static struct vfs_fn_pointers vfs_not_implemented_fns = {
.ftruncate_fn = vfs_not_implemented_ftruncate,
.fallocate_fn = vfs_not_implemented_fallocate,
.lock_fn = vfs_not_implemented_lock,
- .kernel_flock_fn = vfs_not_implemented_kernel_flock,
+ .filesystem_sharemode_fn = vfs_not_implemented_filesystem_sharemode,
.fcntl_fn = vfs_not_implemented_fcntl,
.linux_setlease_fn = vfs_not_implemented_linux_setlease,
.getlock_fn = vfs_not_implemented_getlock,
diff --git a/source3/modules/vfs_streams_xattr.c
b/source3/modules/vfs_streams_xattr.c
index 558bf228794..76b23c7224f 100644
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -1489,17 +1489,19 @@ static bool streams_xattr_getlock(vfs_handle_struct
*handle,
return false;
}
-static int streams_xattr_kernel_flock(vfs_handle_struct *handle,
- files_struct *fsp,
- uint32_t share_access,
- uint32_t access_mask)
+static int streams_xattr_filesystem_sharemode(vfs_handle_struct *handle,
+ files_struct *fsp,
+ uint32_t share_access,
+ uint32_t access_mask)
{
struct stream_io *sio =
(struct stream_io *)VFS_FETCH_FSP_EXTENSION(handle, fsp);
if (sio == NULL) {
- return SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp,
- share_access, access_mask);
--
Samba Shared Repository
