sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-24 10:50:22 +03:00
Code

vfs_streams_xattr: remove fsp argument from get_xattr_size()

Browse Source 
Still in the process of changing all handle based operations to use path
based operations.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=12791

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
(backported from commit 4cc59e6d011cd3804499ba82bb4071973aa9d494)
This commit is contained in:
Ralph Boehme 2017-05-11 17:36:15 +02:00 committed by Karolin Seeger
parent eddec63813
commit 29e8d5cdf2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/modules/vfs_streams_xattr.c
View File

@ -77,7 +77,6 @@ static SMB_INO_T stream_inode(const SMB_STRUCT_STAT *sbuf, const char *sname)
}
static ssize_t get_xattr_size(connection_struct *conn,
files_struct *fsp,
const char *fname,
const char *xattr_name)
{
@ -85,7 +84,7 @@ static ssize_t get_xattr_size(connection_struct *conn,
struct ea_struct ea;
ssize_t result;
status = get_ea_value(talloc_tos(), conn, fsp, fname,
status = get_ea_value(talloc_tos(), conn, NULL, fname,
xattr_name, &ea);
if (!NT_STATUS_IS_OK(status)) {
@ -264,7 +263,7 @@ static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp,
return -1;
}
sbuf->st_ex_size = get_xattr_size(handle->conn, fsp,
sbuf->st_ex_size = get_xattr_size(handle->conn,
io->base, io->xattr_name);
if (sbuf->st_ex_size == -1) {
SET_STAT_INVALID(*sbuf);
@ -316,7 +315,7 @@ static int streams_xattr_stat(vfs_handle_struct *handle,
}
/* Augment the base file's stat information before returning. */
smb_fname->st.st_ex_size = get_xattr_size(handle->conn, NULL,
smb_fname->st.st_ex_size = get_xattr_size(handle->conn,
smb_fname->base_name,
xattr_name);
if (smb_fname->st.st_ex_size == -1) {
@ -368,7 +367,7 @@ static int streams_xattr_lstat(vfs_handle_struct *handle,
}
/* Augment the base file's stat information before returning. */
smb_fname->st.st_ex_size = get_xattr_size(handle->conn, NULL,
smb_fname->st.st_ex_size = get_xattr_size(handle->conn,
smb_fname->base_name,
xattr_name);
if (smb_fname->st.st_ex_size == -1) {