sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-20 14:03:59 +03:00
Code

vfs_ceph: call 'ceph_fgetxattr' only if valid fd

Browse Source 
Align getxattr logic with the rest of xattr hooks: call ceph_fgetxattr
with appropriate io-fd when 'is_pathref' is false; otherwise, call
ceph_getxattr.

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

Signed-off-by: Shachar Sharon <ssharon@redhat.com>
Reviewed-by: Anoop C S <anoopcs@redhat.com>
Reviewed-by: Guenther Deschner <gd@samba.org>

Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Thu Nov 30 12:32:29 UTC 2023 on atb-devel-224

(cherry picked from commit 83edfcff5ccd8c4c710576b6d5612e0578d168c8)

Autobuild-User(v4-18-test): Jule Anger <janger@samba.org>
Autobuild-Date(v4-18-test): Mon Dec 11 13:21:02 UTC 2023 on atb-devel-224
This commit is contained in:
Shachar Sharon 2023-11-16 11:57:02 +02:00 committed by Jule Anger
parent 0a8cf4f1c0
commit 849c370d92
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source3/modules/vfs_ceph.c
View File

@ -1305,11 +1305,32 @@ static const char *cephwrap_connectpath(
Extended attribute operations.
*****************************************************************/
static ssize_t cephwrap_fgetxattr(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, void *value, size_t size)
static ssize_t cephwrap_fgetxattr(struct vfs_handle_struct *handle,
struct files_struct *fsp,
const char *name,
void *value,
size_t size)
{
int ret;
DBG_DEBUG("[CEPH] fgetxattr(%p, %p, %s, %p, %llu)\n", handle, fsp, name, value, llu(size));
ret = ceph_fgetxattr(handle->data, fsp_get_io_fd(fsp), name, value, size);
DBG_DEBUG("[CEPH] fgetxattr(%p, %p, %s, %p, %llu)\n",
handle,
fsp,
name,
value,
llu(size));
if (!fsp->fsp_flags.is_pathref) {
ret = ceph_fgetxattr(handle->data,
fsp_get_io_fd(fsp),
name,
value,
size);
} else {
ret = ceph_getxattr(handle->data,
fsp->fsp_name->base_name,
name,
value,
size);
}
DBG_DEBUG("[CEPH] fgetxattr(...) = %d\n", ret);
if (ret < 0) {
WRAP_RETURN(ret);