s3: VFS: streams_xattr: In streams_xattr_pwrite() - remove conditional.
authorJeremy Allison <jra@samba.org>
Wed, 23 Jun 2021 00:10:50 +0000 (17:10 -0700)
committerRalph Boehme <slow@samba.org>
Fri, 25 Jun 2021 15:53:31 +0000 (15:53 +0000)
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>
source3/modules/vfs_streams_xattr.c

index ed3973ab0d505654f9a52ccd1dee7f1f931c4f85..feec3847b42d7d234172d1ec234cb426a9a0f7cb 100644 (file)
@@ -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) {