vfs_ceph_new: Call vfs_ceph_userperm_new with handle->conn

vfs_ceph_userperm_new() only need connection structure from handle
for fetching the current unix token. Therefore modify the signature
to accept just handle->conn.

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

Signed-off-by: Anoop C S <anoopcs@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
(cherry picked from commit 8c1d774c7e206bb413284d500c5aa950ac3dd3d5)

diff --git a/source3/modules/vfs_ceph_new.c b/source3/modules/vfs_ceph_new.c
index 0b3203ee9d756f729599127dfd5fc64f178fcbb8..45b3c84b8aed3a3704bfefe236497deedd1149b8 100644 (file)
--- a/source3/modules/vfs_ceph_new.c
+++ b/source3/modules/vfs_ceph_new.c
@@ -560,12 +560,11 @@ static void vfs_ceph_disconnect(struct vfs_handle_struct *handle)
 }
 
 /* Ceph user-credentials */
-static struct UserPerm *vfs_ceph_userperm_new(
-       const struct vfs_handle_struct *handle)
+static struct UserPerm *vfs_ceph_userperm_new(struct connection_struct *conn)
 {
        const struct security_unix_token *unix_token = NULL;
 
-       unix_token = get_current_utok(handle->conn);
+       unix_token = get_current_utok(conn);
        return ceph_userperm_new(unix_token->uid,
                                 unix_token->gid,
                                 unix_token->ngroups,
@@ -682,7 +681,7 @@ static int vfs_ceph_add_fh(struct vfs_handle_struct *handle,
 
        cme = config->mount_entry;
 
-       uperm = vfs_ceph_userperm_new(handle);
+       uperm = vfs_ceph_userperm_new(handle->conn);
        if (uperm == NULL) {
                return -ENOMEM;
        }
@@ -762,7 +761,7 @@ static int vfs_ceph_ll_walk(const struct vfs_handle_struct *handle,
 
        DBG_DEBUG("[ceph] ceph_ll_walk: name=%s\n", name);
 
-       uperm = vfs_ceph_userperm_new(handle);
+       uperm = vfs_ceph_userperm_new(handle->conn);
        if (uperm == NULL) {
                return -ENOMEM;
        }
@@ -826,7 +825,7 @@ static int vfs_ceph_ll_getattr(const struct vfs_handle_struct *handle,
        struct UserPerm *uperm = NULL;
        int ret = -1;
 
-       uperm = vfs_ceph_userperm_new(handle);
+       uperm = vfs_ceph_userperm_new(handle->conn);
        if (uperm == NULL) {
                return -ENOMEM;
        }
@@ -851,7 +850,7 @@ static int vfs_ceph_ll_chown(struct vfs_handle_struct *handle,
        DBG_DEBUG("[ceph] ceph_ll_setattr: ino=%" PRIu64 " uid=%u gid=%u\n",
                  iref->ino, uid, gid);
 
-       uperm = vfs_ceph_userperm_new(handle);
+       uperm = vfs_ceph_userperm_new(handle->conn);
        if (uperm == NULL) {
                return -ENOMEM;
        }
@@ -1025,7 +1024,7 @@ static int vfs_ceph_ll_lookup(const struct vfs_handle_struct *handle,
        DBG_DEBUG("[ceph] ceph_ll_lookup: parent-ino=%" PRIu64 " name=%s\n",
                  parent->ino, name);
 
-       uperm = vfs_ceph_userperm_new(handle);
+       uperm = vfs_ceph_userperm_new(handle->conn);
        if (uperm == NULL) {
                return -ENOMEM;
        }
@@ -1508,7 +1507,7 @@ static int vfs_ceph_ll_getxattr(const struct vfs_handle_struct *handle,
        DBG_DEBUG("[ceph] ceph_ll_getxattr: ino=%" PRIu64 " name=%s\n",
                  iref->ino, name);
 
-       uperm = vfs_ceph_userperm_new(handle);
+       uperm = vfs_ceph_userperm_new(handle->conn);
        if (uperm == NULL) {
                return -ENOMEM;
        }
@@ -1564,7 +1563,7 @@ static int vfs_ceph_ll_setxattr(const struct vfs_handle_struct *handle,
        DBG_DEBUG("[ceph] ceph_ll_setxattr: ino=%" PRIu64 " name=%s "
                  "size=%zu\n", iref->ino, name, size);
 
-       uperm = vfs_ceph_userperm_new(handle);
+       uperm = vfs_ceph_userperm_new(handle->conn);
        if (uperm == NULL) {
                return -ENOMEM;
        }
@@ -1621,7 +1620,7 @@ static int vfs_ceph_ll_listxattr(const struct vfs_handle_struct *handle,
 
        DBG_DEBUG("[ceph] ceph_ll_listxattr: ino=%" PRIu64 "\n", iref->ino);
 
-       uperm = vfs_ceph_userperm_new(handle);
+       uperm = vfs_ceph_userperm_new(handle->conn);
        if (uperm == NULL) {
                return -ENOMEM;
        }
@@ -1673,7 +1672,7 @@ static int vfs_ceph_ll_removexattr(const struct vfs_handle_struct *handle,
        DBG_DEBUG("[ceph] ceph_ll_removexattr: ino=%" PRIu64 " name=%s\n",
                  iref->ino, name);
 
-       uperm = vfs_ceph_userperm_new(handle);
+       uperm = vfs_ceph_userperm_new(handle->conn);
        if (uperm == NULL) {
                return -ENOMEM;
        }