From: Noel Power <noel.power@suse.com>
Date: Tue, 2 Feb 2021 19:33:39 +0000 (+0000)
Subject: s3/smbd: no longer pass smb_fname to get_ea_list_from_file
X-Git-Tag: tevent-0.11.0~1715
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=772b0a00649e7b9a3824c1b18d37169b96ab9ad7;p=thirdparty%2Fsamba.git

s3/smbd: no longer pass smb_fname to get_ea_list_from_file

Finally remove the smb_fname paramater as it is no longer used

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

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index a9b821a8ef4..eba99eb7639 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -527,8 +527,10 @@ static NTSTATUS get_ea_list_from_file_path(TALLOC_CTX *mem_ctx,
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS get_ea_list_from_file(TALLOC_CTX *mem_ctx, connection_struct *conn, files_struct *fsp,
-				      const struct smb_filename *smb_fname, size_t *pea_total_len, struct ea_list **ea_list)
+static NTSTATUS get_ea_list_from_file(TALLOC_CTX *mem_ctx,
+				connection_struct *conn, files_struct *fsp,
+				size_t *pea_total_len,
+				struct ea_list **ea_list)
 {
 	*pea_total_len = 0;
 	*ea_list = NULL;
@@ -1990,7 +1992,6 @@ static NTSTATUS smbd_marshall_dir_entry(TALLOC_CTX *ctx,
 
 		status = get_ea_list_from_file(ctx, conn,
 					       smb_fname->fsp,
-					       smb_fname,
 					       &ea_len, &file_list);
 		if (!NT_STATUS_IS_OK(status)) {
 			file_list = NULL;
@@ -5454,7 +5455,6 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
 			status =
 			    get_ea_list_from_file(mem_ctx, conn,
 						  smb_fname->fsp,
-						  smb_fname,
 						  &total_ea_len, &ea_file_list);
 			if (!NT_STATUS_IS_OK(status)) {
 				return status;
@@ -5480,7 +5480,6 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
 
 			status = get_ea_list_from_file(mem_ctx, conn,
 							smb_fname->fsp,
-							smb_fname,
 							&total_ea_len, &ea_list);
 			if (!NT_STATUS_IS_OK(status)) {
 				return status;
@@ -5509,7 +5508,6 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
 			status  =
 				get_ea_list_from_file(mem_ctx, conn,
 						  smb_fname->fsp,
-						  smb_fname,
 						  &total_ea_len, &ea_file_list);
 			if (!NT_STATUS_IS_OK(status)) {
 				return status;