sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3: VFS: default: Move vfswrap_fgetxattr() before the async versions.

Browse Source 
We want to re-use this and don't want to have to add forward
declarations.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14758

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2021-07-14 11:17:49 -07:00 committed by Ralph Boehme
parent d1ffcc8064
commit e0b327f2eb
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
source3/modules/vfs_default.c
View File

@ -3425,6 +3425,36 @@ static int vfswrap_sys_acl_delete_def_fd(vfs_handle_struct *handle,
Extended attribute operations.
*****************************************************************/
static ssize_t vfswrap_fgetxattr(struct vfs_handle_struct *handle,
struct files_struct *fsp,
const char *name,
void *value,
size_t size)
{
int fd = fsp_get_pathref_fd(fsp);
if (!fsp->fsp_flags.is_pathref) {
return fgetxattr(fd, name, value, size);
}
if (fsp->fsp_flags.have_proc_fds) {
const char *p = NULL;
char buf[PATH_MAX];
p = sys_proc_fd_path(fd, buf, sizeof(buf));
if (p == NULL) {
return -1;
}
return getxattr(p, name, value, size);
}
/*
* This is no longer a handle based call.
*/
return getxattr(fsp->fsp_name->base_name, name, value, size);
}
struct vfswrap_getxattrat_state {
struct tevent_context *ev;
files_struct *dir_fsp;
@ -3742,36 +3772,6 @@ static ssize_t vfswrap_getxattrat_recv(struct tevent_req *req,
return xattr_size;
}
static ssize_t vfswrap_fgetxattr(struct vfs_handle_struct *handle,
struct files_struct *fsp,
const char *name,
void *value,
size_t size)
{
int fd = fsp_get_pathref_fd(fsp);
if (!fsp->fsp_flags.is_pathref) {
return fgetxattr(fd, name, value, size);
}
if (fsp->fsp_flags.have_proc_fds) {
const char *p = NULL;
char buf[PATH_MAX];
p = sys_proc_fd_path(fd, buf, sizeof(buf));
if (p == NULL) {
return -1;
}
return getxattr(p, name, value, size);
}
/*
* This is no longer a handle based call.
*/
return getxattr(fsp->fsp_name->base_name, name, value, size);
}
static ssize_t vfswrap_flistxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, char *list, size_t size)
{
int fd = fsp_get_pathref_fd(fsp);