From: Jeremy Allison <jra@samba.org>
Date: Wed, 23 Jun 2021 00:10:50 +0000 (-0700)
Subject: s3: VFS: streams_xattr: In streams_xattr_pwrite() - remove conditional.
X-Git-Tag: tevent-0.11.0~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28f7846fdd507a6befea76518f8cd45855e51fc7;p=thirdparty%2Fsamba.git

s3: VFS: streams_xattr: In streams_xattr_pwrite() - remove conditional.

We know fsp->base_fsp must be valid here for SMB_VFS_FSETXATTR().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
index ed3973ab0d5..feec3847b42 100644
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -1032,9 +1032,11 @@ static ssize_t streams_xattr_pwrite(vfs_handle_struct *handle,
 
         memcpy(ea.value.data + offset, data, n);
 
-	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);
 
 	if (ret == -1) {