[SCM] Samba Shared Repository - branch v4-18-test updated

[Jule Anger]

The branch, v4-18-test has been updated
       via  849c370d92a vfs_ceph: call 'ceph_fgetxattr' only if valid fd
      from  0a8cf4f1c06 testprogs: Add net offlinejoin composeodj tests

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-18-test


- Log -----------------------------------------------------------------
commit 849c370d92a1fca18450ba7d0064e1adab4a77e4
Author: Shachar Sharon <ssharon at redhat.com>
Date:   Thu Nov 16 11:57:02 2023 +0200

    vfs_ceph: call 'ceph_fgetxattr' only if valid fd
    
    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 at redhat.com>
    Reviewed-by: Anoop C S <anoopcs at redhat.com>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at 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 at samba.org>
    Autobuild-Date(v4-18-test): Mon Dec 11 13:21:02 UTC 2023 on atb-devel-224

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_ceph.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c
index c5ee9d5967c..9fa0f760084 100644
--- a/source3/modules/vfs_ceph.c
+++ b/source3/modules/vfs_ceph.c
@@ -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);


-- 
Samba Shared Repository