diff options
| author | Ralph Boehme <slow@samba.org> | 2017-07-09 14:21:21 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2017-07-24 22:00:37 +0200 |
| commit | e44257aa15c25dc2b5b02c739d5fb61a325856f2 (patch) | |
| tree | 7b3a22d6cc32e0170a8ada79c013270a00d431c1 /source3/include | |
| parent | 8559b2e54663cc2f3a2f63c67d78e62af0f4c087 (diff) | |
| download | samba-e44257aa15c25dc2b5b02c739d5fb61a325856f2.tar.gz | |
s3/vfs: remove SMB_VFS_STRICT_UNLOCK
It's just a noop, so let's remove it. SMB_VFS_STRICT_LOCK doesn't set
logs, it just checks for the presence of incompatible locks.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12887
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit c9172c5a4505eb18cb4645e2436eabcc93ec67e1)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/vfs.h | 8 | ||||
| -rw-r--r-- | source3/include/vfs_macros.h | 5 |
2 files changed, 1 insertions, 12 deletions
diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 7b9a6f8f085..bd00e8f0318 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -241,6 +241,7 @@ /* Version 37 - Add SMB_VFS_OFFLOAD_READ_SEND/RECV */ /* Version 37 - Rename SMB_VFS_COPY_CHUNK_SEND/RECV to SMB_VFS_OFFLOAD_READ_SEND/RECV */ +/* Version 37 - Remove SMB_VFS_STRICT_UNLOCK */ #define SMB_VFS_INTERFACE_VERSION 37 @@ -852,10 +853,6 @@ struct vfs_fn_pointers { struct files_struct *fsp, struct lock_struct *plock); - void (*strict_unlock_fn)(struct vfs_handle_struct *handle, - struct files_struct *fsp, - struct lock_struct *plock); - NTSTATUS (*translate_name_fn)(struct vfs_handle_struct *handle, const char *name, enum vfs_translate_direction direction, @@ -1318,9 +1315,6 @@ bool smb_vfs_call_brl_cancel_windows(struct vfs_handle_struct *handle, bool smb_vfs_call_strict_lock(struct vfs_handle_struct *handle, struct files_struct *fsp, struct lock_struct *plock); -void smb_vfs_call_strict_unlock(struct vfs_handle_struct *handle, - struct files_struct *fsp, - struct lock_struct *plock); NTSTATUS smb_vfs_call_translate_name(struct vfs_handle_struct *handle, const char *name, enum vfs_translate_direction direction, diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 69fa85b297b..843d62617d3 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -381,11 +381,6 @@ #define SMB_VFS_NEXT_STRICT_LOCK(handle, fsp, plock) \ smb_vfs_call_strict_lock((handle)->next, (fsp), (plock)) -#define SMB_VFS_STRICT_UNLOCK(conn, fsp, plock) \ - smb_vfs_call_strict_unlock((conn)->vfs_handles, (fsp), (plock)) -#define SMB_VFS_NEXT_STRICT_UNLOCK(handle, fsp, plock) \ - smb_vfs_call_strict_unlock((handle)->next, (fsp), (plock)) - #define SMB_VFS_TRANSLATE_NAME(conn, name, direction, mem_ctx, mapped_name) \ smb_vfs_call_translate_name((conn)->vfs_handles, (name), (direction), (mem_ctx), (mapped_name)) #define SMB_VFS_NEXT_TRANSLATE_NAME(handle, name, direction, mem_ctx, mapped_name) \ |