vfs_streams_xattr: remove fsp argument from get_xattr_size()
authorRalph Boehme <slow@samba.org>
Thu, 11 May 2017 15:36:15 +0000 (17:36 +0200)
committerVolker Lendecke <vl@samba.org>
Wed, 9 Aug 2017 16:41:06 +0000 (18:41 +0200)
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>
source3/modules/vfs_streams_xattr.c

index 90e9771e5295b5cf7e51925cd2ac3a9cd2211a99..971a00c039f5d9a006528dc00283149cf6e895ab 100644 (file)
@@ -78,7 +78,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 struct smb_filename *smb_fname,
                                const char *xattr_name)
 {
@@ -86,7 +85,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, smb_fname,
+       status = get_ea_value(talloc_tos(), conn, NULL, smb_fname,
                              xattr_name, &ea);
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -265,7 +264,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,
                                        smb_fname_base, io->xattr_name);
        if (sbuf->st_ex_size == -1) {
                TALLOC_FREE(smb_fname_base);
@@ -319,7 +318,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,
                                                  xattr_name);
        if (smb_fname->st.st_ex_size == -1) {
@@ -371,7 +370,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,
                                                  xattr_name);
        if (smb_fname->st.st_ex_size == -1) {