From: Noel Power <noel.power@suse.com>
Date: Wed, 28 Apr 2021 16:20:21 +0000 (+0100)
Subject: s3/modules: VFS: fruit: Remove SMB_VFS_STREAMINFO
X-Git-Tag: tevent-0.11.0~914
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98c20b3aa33a510fcf98c5fc0234668a625e2b21;p=thirdparty%2Fsamba.git

s3/modules: VFS: fruit: Remove SMB_VFS_STREAMINFO

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index d7bfe4f5722..856a7beb650 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3834,44 +3834,6 @@ static void fruit_filter_empty_streams(unsigned int *pnum_streams,
 	*pnum_streams = num_streams;
 }
 
-static NTSTATUS fruit_streaminfo(vfs_handle_struct *handle,
-				 struct files_struct *fsp,
-				 const struct smb_filename *smb_fname,
-				 TALLOC_CTX *mem_ctx,
-				 unsigned int *pnum_streams,
-				 struct stream_struct **pstreams)
-{
-	struct fruit_config_data *config = NULL;
-	NTSTATUS status;
-
-	SMB_VFS_HANDLE_GET_DATA(handle, config, struct fruit_config_data,
-				return NT_STATUS_UNSUCCESSFUL);
-
-	DBG_DEBUG("Path [%s]\n", smb_fname_str_dbg(smb_fname));
-
-	status = SMB_VFS_NEXT_STREAMINFO(handle, fsp, smb_fname, mem_ctx,
-					 pnum_streams, pstreams);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	fruit_filter_empty_streams(pnum_streams, pstreams);
-
-	status = fruit_streaminfo_meta(handle, fsp, smb_fname,
-				       mem_ctx, pnum_streams, pstreams);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	status = fruit_streaminfo_rsrc(handle, fsp, smb_fname,
-				       mem_ctx, pnum_streams, pstreams);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	return NT_STATUS_OK;
-}
-
 static NTSTATUS fruit_fstreaminfo(vfs_handle_struct *handle,
 				 struct files_struct *fsp,
 				 TALLOC_CTX *mem_ctx,
@@ -5247,7 +5209,6 @@ static struct vfs_fn_pointers vfs_fruit_fns = {
 	.stat_fn = fruit_stat,
 	.lstat_fn = fruit_lstat,
 	.fstat_fn = fruit_fstat,
-	.streaminfo_fn = fruit_streaminfo,
 	.fstreaminfo_fn = fruit_fstreaminfo,
 	.fntimes_fn = fruit_fntimes,
 	.ftruncate_fn = fruit_ftruncate,