diff options
| author | Ralph Boehme <slow@samba.org> | 2017-07-09 14:21:21 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2017-07-10 23:22:10 +0200 |
| commit | c9172c5a4505eb18cb4645e2436eabcc93ec67e1 (patch) | |
| tree | 8978ff23414f8094cc45df46e7998c380e8be9fa /examples/VFS | |
| parent | 77cbced5d2f8bf65c8d02f5edfaba8cbad519d08 (diff) | |
| download | samba-c9172c5a4505eb18cb4645e2436eabcc93ec67e1.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>
Diffstat (limited to 'examples/VFS')
| -rw-r--r-- | examples/VFS/skel_opaque.c | 8 | ||||
| -rw-r--r-- | examples/VFS/skel_transparent.c | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c index fed9d2f3ddb..072ec8036b1 100644 --- a/examples/VFS/skel_opaque.c +++ b/examples/VFS/skel_opaque.c @@ -695,13 +695,6 @@ static bool skel_strict_lock(struct vfs_handle_struct *handle, return false; } -static void skel_strict_unlock(struct vfs_handle_struct *handle, - struct files_struct *fsp, - struct lock_struct *plock) -{ - ; -} - static NTSTATUS skel_translate_name(struct vfs_handle_struct *handle, const char *mapped_name, enum vfs_translate_direction direction, @@ -1023,7 +1016,6 @@ struct vfs_fn_pointers skel_opaque_fns = { .brl_unlock_windows_fn = skel_brl_unlock_windows, .brl_cancel_windows_fn = skel_brl_cancel_windows, .strict_lock_fn = skel_strict_lock, - .strict_unlock_fn = skel_strict_unlock, .translate_name_fn = skel_translate_name, .fsctl_fn = skel_fsctl, .readdir_attr_fn = skel_readdir_attr, diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c index d9123e091c1..9592c17414a 100644 --- a/examples/VFS/skel_transparent.c +++ b/examples/VFS/skel_transparent.c @@ -863,13 +863,6 @@ static bool skel_strict_lock(struct vfs_handle_struct *handle, return SMB_VFS_NEXT_STRICT_LOCK(handle, fsp, plock); } -static void skel_strict_unlock(struct vfs_handle_struct *handle, - struct files_struct *fsp, - struct lock_struct *plock) -{ - SMB_VFS_NEXT_STRICT_UNLOCK(handle, fsp, plock); -} - static NTSTATUS skel_translate_name(struct vfs_handle_struct *handle, const char *mapped_name, enum vfs_translate_direction direction, @@ -1196,7 +1189,6 @@ struct vfs_fn_pointers skel_transparent_fns = { .brl_unlock_windows_fn = skel_brl_unlock_windows, .brl_cancel_windows_fn = skel_brl_cancel_windows, .strict_lock_fn = skel_strict_lock, - .strict_unlock_fn = skel_strict_unlock, .translate_name_fn = skel_translate_name, .fsctl_fn = skel_fsctl, .readdir_attr_fn = skel_readdir_attr, |