From b0cffaa0886b550d20ca9028b5fd1d30c3a69691 Mon Sep 17 00:00:00 2001 From: Shachar Sharon Date: Thu, 16 Nov 2023 11:57:02 +0200 Subject: [PATCH] vfs_ceph: call 'ceph_fgetxattr' only if valid fd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Anoop C S Reviewed-by: Guenther Deschner Autobuild-User(master): Günther Deschner Autobuild-Date(master): Thu Nov 30 12:32:29 UTC 2023 on atb-devel-224 (cherry picked from commit 83edfcff5ccd8c4c710576b6d5612e0578d168c8) --- source3/modules/vfs_ceph.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c index d7772c62119..353183fa0bb 100644 --- a/source3/modules/vfs_ceph.c +++ b/source3/modules/vfs_ceph.c @@ -1414,11 +1414,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); -- 2.43.0