s3/smbd: Remove connection_struct from get_ea_names_from_file

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

diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
index ca85ad86705550a3fe0bb65d22e489d3456b2287..58ddacdb62d025b5c80468914f788a537666dbb6 100644 (file)
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -685,7 +685,6 @@ static NTSTATUS walk_xattr_streams(vfs_handle_struct *handle,
                                return NT_STATUS_UNSUCCESSFUL);
 
        status = get_ea_names_from_file(talloc_tos(),
-                               handle->conn,
                                smb_fname->fsp,
                                &names,
                                &num_names);

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index c2e253227665f72dc75b150b4a458e0a2d99c097..ab933bcc520183eb4896f2b854b987b83201dbd0 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -788,7 +788,7 @@ void reply_ntcreate_and_X(struct smb_request *req)
                        size_t num_names = 0;
                        /* Do we have any EA's ? */
                        status = get_ea_names_from_file(
-                           ctx, conn, smb_fname->fsp, NULL, &num_names);
+                           ctx, smb_fname->fsp, NULL, &num_names);
                        if (NT_STATUS_IS_OK(status) && num_names) {
                                file_status &= ~NO_EAS;
                        }
@@ -1466,7 +1466,7 @@ static void call_nt_transact_create(connection_struct *conn,
                        size_t num_names = 0;
                        /* Do we have any EA's ? */
                        status = get_ea_names_from_file(
-                           ctx, conn, smb_fname->fsp, NULL, &num_names);
+                           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 5d7fee329f3a90d647f66da83f2484ab635d55f4..7c98fdeb0cdea17c7f34cef9af34b7c9a2e9f4a2 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -1213,7 +1213,6 @@ NTSTATUS get_ea_value(TALLOC_CTX *mem_ctx, connection_struct *conn,
                        const char *ea_name,
                        struct ea_struct *pea);
 NTSTATUS get_ea_names_from_file(TALLOC_CTX *mem_ctx,
-                       connection_struct *conn,
                        files_struct *fsp,
                        char ***pnames,
                        size_t *pnum_names);

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 87bb3d48a61bfa194ed36581d31f6670e58005a6..fb528eceeb60b98b80f0ae8a86ff564f3954a209 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -292,7 +292,6 @@ NTSTATUS get_ea_value(TALLOC_CTX *mem_ctx,
 }
 
 NTSTATUS get_ea_names_from_file(TALLOC_CTX *mem_ctx,
-                               connection_struct *conn,
                                files_struct *fsp,
                                char ***pnames,
                                size_t *pnum_names)
@@ -449,7 +448,6 @@ 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(),
-                               fsp->conn,
                                fsp,
                                &names,
                                &num_names);