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 5e0fbb9b4c0ce8490124818a4ed727c9fe99fcfd..2df2c5b9fc6cf9aa0af5f0c95f2238f9d3ac2c45 100644 (file)
--- 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 138a26af2f2a41a3feebcc8d15765ab9b04a07e9..ffff822e2217e9bb28b2824988ef6e2f9f537aed 100644 (file)
--- 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 2bea05d2666f8afee54da242b5207e64cb3f78b6..1d66251d23221dafc3538ca6ad89cabf17d05869 100644 (file)
--- 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 2fe88fa8cb3625992ab29a50d304135fdd817eb4..b03a7721901b8a9d088d36ff1249c385236f7e70 100644 (file)
--- 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);