sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

smbd: Simplify dos_mode_check_compressed()

Browse Source 
btrfs_fget_compression() is the only real implementation of
VFS_GET_COMPRESSION. It does not use the mem_ctx argument, so it seems
unnecessary to do a full malloc()/free() cycle here. Moreover, if this
was actually required, talloc_stackframe() would be more appropriate
these days as deep within the smbd even loop it does not go through
the libc malloc, but just increments a pointer.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2022-03-10 19:18:44 +01:00 committed by Ralph Boehme
parent 0e4cc565e6
commit 469a7ebf76
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/smbd/dosmode.c
View File

@ -598,16 +598,11 @@ static NTSTATUS dos_mode_check_compressed(struct files_struct *fsp,
{
NTSTATUS status;
uint16_t compression_fmt;
TALLOC_CTX *tmp_ctx = talloc_new(NULL);
if (tmp_ctx == NULL) {
status = NT_STATUS_NO_MEMORY;
goto err_out;
}
status = SMB_VFS_FGET_COMPRESSION(fsp->conn, tmp_ctx, fsp,
&compression_fmt);
status = SMB_VFS_FGET_COMPRESSION(
fsp->conn, talloc_tos(), fsp, &compression_fmt);
if (!NT_STATUS_IS_OK(status)) {
goto err_ctx_free;
return status;
}
if (compression_fmt == COMPRESSION_FORMAT_LZNT1) {
@ -615,12 +610,7 @@ static NTSTATUS dos_mode_check_compressed(struct files_struct *fsp,
} else {
*is_compressed = false;
}
status = NT_STATUS_OK;
err_ctx_free:
talloc_free(tmp_ctx);
err_out:
return status;
return NT_STATUS_OK;
}
static uint32_t dos_mode_from_name(connection_struct *conn,