From: Jeremy Allison <jra@samba.org>
Date: Wed, 23 Jun 2021 19:12:30 +0000 (-0700)
Subject: s3: smbd: Cleanup - rename get_ea_names_from_file() -> get_ea_names_from_fsp().
X-Git-Tag: tevent-0.11.0~158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2fde31b1c2ec7482f7424f7b7cb443aae582c2e;p=thirdparty%2Fsamba.git

s3: smbd: Cleanup - rename get_ea_names_from_file() -> get_ea_names_from_fsp().

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

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Fri Jun 25 16:37:59 UTC 2021 on sn-devel-184
---

diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
index 5e0fbb9b4c0..2df2c5b9fc6 100644
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -718,7 +718,7 @@ static NTSTATUS walk_xattr_streams(vfs_handle_struct *handle,
 	SMB_VFS_HANDLE_GET_DATA(handle, config, struct streams_xattr_config,
 				return NT_STATUS_UNSUCCESSFUL);
 
-	status = get_ea_names_from_file(talloc_tos(),
+	status = get_ea_names_from_fsp(talloc_tos(),
 				smb_fname->fsp,
 				&names,
 				&num_names);
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 138a26af2f2..ffff822e221 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -787,7 +787,7 @@ void reply_ntcreate_and_X(struct smb_request *req)
 		if (lp_ea_support(SNUM(conn))) {
 			size_t num_names = 0;
 			/* Do we have any EA's ? */
-			status = get_ea_names_from_file(
+			status = get_ea_names_from_fsp(
 			    ctx, smb_fname->fsp, NULL, &num_names);
 			if (NT_STATUS_IS_OK(status) && num_names) {
 				file_status &= ~NO_EAS;
@@ -1478,7 +1478,7 @@ static void call_nt_transact_create(connection_struct *conn,
 		if (lp_ea_support(SNUM(conn))) {
 			size_t num_names = 0;
 			/* Do we have any EA's ? */
-			status = get_ea_names_from_file(
+			status = get_ea_names_from_fsp(
 			    ctx, smb_fname->fsp, NULL, &num_names);
 			if (NT_STATUS_IS_OK(status) && num_names) {
 				file_status &= ~NO_EAS;
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 2bea05d2666..1d66251d232 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -1203,7 +1203,7 @@ NTSTATUS get_ea_value_fsp(TALLOC_CTX *mem_ctx,
 			  files_struct *fsp,
 			  const char *ea_name,
 			  struct ea_struct *pea);
-NTSTATUS get_ea_names_from_file(TALLOC_CTX *mem_ctx,
+NTSTATUS get_ea_names_from_fsp(TALLOC_CTX *mem_ctx,
 			files_struct *fsp,
 			char ***pnames,
 			size_t *pnum_names);
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 2fe88fa8cb3..b03a7721901 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -274,7 +274,7 @@ NTSTATUS get_ea_value_fsp(TALLOC_CTX *mem_ctx,
 	return NT_STATUS_OK;
 }
 
-NTSTATUS get_ea_names_from_file(TALLOC_CTX *mem_ctx,
+NTSTATUS get_ea_names_from_fsp(TALLOC_CTX *mem_ctx,
 				files_struct *fsp,
 				char ***pnames,
 				size_t *pnum_names)
@@ -430,7 +430,7 @@ static NTSTATUS get_ea_list_from_fsp(TALLOC_CTX *mem_ctx,
 
 	posix_pathnames = (fsp->fsp_name->flags & SMB_FILENAME_POSIX_PATH);
 
-	status = get_ea_names_from_file(talloc_tos(),
+	status = get_ea_names_from_fsp(talloc_tos(),
 				fsp,
 				&names,
 				&num_names);