From: Jeremy Allison Date: Wed, 23 Jun 2021 00:36:28 +0000 (-0700) Subject: s3: VFS: streams_xattr: In streams_xattr_ftruncate() - remove conditional. X-Git-Tag: tevent-0.11.0~172 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d12971c58beaddb8400bba9e134eb5e4439894b;p=thirdparty%2Fsamba.git s3: VFS: streams_xattr: In streams_xattr_ftruncate() - remove conditional. We know fsp->base_fsp must be valid here for SMB_VFS_FSETXATTR() Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c index 677d3348364..780b0d76d26 100644 --- a/source3/modules/vfs_streams_xattr.c +++ b/source3/modules/vfs_streams_xattr.c @@ -1305,9 +1305,11 @@ static int streams_xattr_ftruncate(struct vfs_handle_struct *handle, ea.value.length = offset + 1; ea.value.data[offset] = 0; - ret = SMB_VFS_FSETXATTR(fsp->base_fsp ? fsp->base_fsp : fsp, - sio->xattr_name, - ea.value.data, ea.value.length, 0); + ret = SMB_VFS_FSETXATTR(fsp->base_fsp, + sio->xattr_name, + ea.value.data, + ea.value.length, + 0); TALLOC_FREE(ea.value.data);