From d95523041bb5ccb94df8cd8353133881ddb6590c Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 8 Sep 2017 15:27:37 -0700 Subject: [PATCH] s3: VFS: streams_xattr: Compression is only set/get on base filenames. Can be ignored (pass-through) in streams_xattr VFS module. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13003 Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme (cherry picked from commit 1a7c0f77e2203aa674eb8b06fe3220868f100001) --- source3/modules/vfs_streams_xattr.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c index b8d2eb955ec..f75f6a18dd6 100644 --- a/source3/modules/vfs_streams_xattr.c +++ b/source3/modules/vfs_streams_xattr.c @@ -1653,40 +1653,6 @@ static bool streams_xattr_strict_lock_check(struct vfs_handle_struct *handle, return true; } -static NTSTATUS streams_xattr_get_compression(struct vfs_handle_struct *handle, - TALLOC_CTX *mem_ctx, - struct files_struct *fsp, - struct smb_filename *smb_fname, - uint16_t *_compression_fmt) -{ - struct stream_io *sio = - (struct stream_io *)VFS_FETCH_FSP_EXTENSION(handle, fsp); - - if (sio == NULL) { - return SMB_VFS_NEXT_GET_COMPRESSION(handle, mem_ctx, fsp, - smb_fname, _compression_fmt); - } - - *_compression_fmt = COMPRESSION_FORMAT_NONE; - return NT_STATUS_OK; -} - -static NTSTATUS streams_xattr_set_compression(struct vfs_handle_struct *handle, - TALLOC_CTX *mem_ctx, - struct files_struct *fsp, - uint16_t compression_fmt) -{ - struct stream_io *sio = - (struct stream_io *)VFS_FETCH_FSP_EXTENSION(handle, fsp); - - if (sio == NULL) { - return SMB_VFS_NEXT_SET_COMPRESSION(handle, mem_ctx, fsp, - compression_fmt); - } - - return NT_STATUS_NOT_SUPPORTED; -} - static struct vfs_fn_pointers vfs_streams_xattr_fns = { .fs_capabilities_fn = streams_xattr_fs_capabilities, .connect_fn = streams_xattr_connect, @@ -1715,9 +1681,6 @@ static struct vfs_fn_pointers vfs_streams_xattr_fns = { .linux_setlease_fn = streams_xattr_linux_setlease, .strict_lock_check_fn = streams_xattr_strict_lock_check, - .get_compression_fn = streams_xattr_get_compression, - .set_compression_fn = streams_xattr_set_compression, - .fchown_fn = streams_xattr_fchown, .fchmod_fn = streams_xattr_fchmod, .fsync_fn = streams_xattr_fsync, -- 2.11.4.GIT