diff options
| author | Ralph Boehme <slow@samba.org> | 2017-07-09 14:34:10 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2017-07-11 03:37:44 +0200 |
| commit | 67466271c26ca10c6bce6a51f9dd97a22258f8a4 (patch) | |
| tree | c81b1a549a559d671fabf65eaef05907cdef8fac /examples | |
| parent | c9172c5a4505eb18cb4645e2436eabcc93ec67e1 (diff) | |
| download | samba-67466271c26ca10c6bce6a51f9dd97a22258f8a4.tar.gz | |
s3/vfs: rename SMB_VFS_STRICT_LOCK to SMB_VFS_STRICT_LOCK_CHECK
As per MS-SMB2 and MS-FSA and our SMB_VFS_STRICT_LOCK implementation,
we're merely testing for locks, not setting any.
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>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Jul 11 03:37:44 CEST 2017 on sn-devel-144
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/VFS/skel_opaque.c | 8 | ||||
| -rw-r--r-- | examples/VFS/skel_transparent.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c index 072ec8036b1..614dcffa928 100644 --- a/examples/VFS/skel_opaque.c +++ b/examples/VFS/skel_opaque.c @@ -687,9 +687,9 @@ static bool skel_brl_cancel_windows(struct vfs_handle_struct *handle, return false; } -static bool skel_strict_lock(struct vfs_handle_struct *handle, - struct files_struct *fsp, - struct lock_struct *plock) +static bool skel_strict_lock_check(struct vfs_handle_struct *handle, + struct files_struct *fsp, + struct lock_struct *plock) { errno = ENOSYS; return false; @@ -1015,7 +1015,7 @@ struct vfs_fn_pointers skel_opaque_fns = { .brl_lock_windows_fn = skel_brl_lock_windows, .brl_unlock_windows_fn = skel_brl_unlock_windows, .brl_cancel_windows_fn = skel_brl_cancel_windows, - .strict_lock_fn = skel_strict_lock, + .strict_lock_check_fn = skel_strict_lock_check, .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 9592c17414a..2f59a3db870 100644 --- a/examples/VFS/skel_transparent.c +++ b/examples/VFS/skel_transparent.c @@ -856,11 +856,11 @@ static bool skel_brl_cancel_windows(struct vfs_handle_struct *handle, return SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock); } -static bool skel_strict_lock(struct vfs_handle_struct *handle, - struct files_struct *fsp, - struct lock_struct *plock) +static bool skel_strict_lock_check(struct vfs_handle_struct *handle, + struct files_struct *fsp, + struct lock_struct *plock) { - return SMB_VFS_NEXT_STRICT_LOCK(handle, fsp, plock); + return SMB_VFS_NEXT_STRICT_LOCK_CHECK(handle, fsp, plock); } static NTSTATUS skel_translate_name(struct vfs_handle_struct *handle, @@ -1188,7 +1188,7 @@ struct vfs_fn_pointers skel_transparent_fns = { .brl_lock_windows_fn = skel_brl_lock_windows, .brl_unlock_windows_fn = skel_brl_unlock_windows, .brl_cancel_windows_fn = skel_brl_cancel_windows, - .strict_lock_fn = skel_strict_lock, + .strict_lock_check_fn = skel_strict_lock_check, .translate_name_fn = skel_translate_name, .fsctl_fn = skel_fsctl, .readdir_attr_fn = skel_readdir_attr, |