diff options
| author | Noel Power <noel.power@suse.com> | 2021-02-10 12:46:09 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2021-02-26 21:28:33 +0000 |
| commit | 1d1b80e5dc594e64f73db787a3ca0b5c3e3f11a7 (patch) | |
| tree | 05f3c0afe2d9a18d78a6c0f08b05560509b7e2f8 /source3 | |
| parent | de83946311d8c1f007c236751280e9f101cc3a29 (diff) | |
| download | samba-1d1b80e5dc594e64f73db787a3ca0b5c3e3f11a7.tar.gz | |
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>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/modules/vfs_streams_xattr.c | 1 | ||||
| -rw-r--r-- | source3/smbd/nttrans.c | 4 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 1 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c index ca85ad86705..58ddacdb62d 100644 --- 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 c2e25322766..ab933bcc520 100644 --- 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 5d7fee329f3..7c98fdeb0cd 100644 --- 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 87bb3d48a61..fb528eceeb6 100644 --- 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); |