From b8477abbdefade3e7c005f77cc8aaf7da1bcc25a Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 17 May 2018 11:19:33 -0700 Subject: [PATCH] s3: modules: vfs_ceph: Remove CHMOD_ACL in cephwrap_chmod(). Now I understand the use of the mask in POSIX ACLs this extra step is no longer needed. Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke --- source3/modules/vfs_ceph.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c index f3b651b894e..818d0cb5490 100644 --- a/source3/modules/vfs_ceph.c +++ b/source3/modules/vfs_ceph.c @@ -946,26 +946,6 @@ static int cephwrap_chmod(struct vfs_handle_struct *handle, int result; DBG_DEBUG("[CEPH] chmod(%p, %s, %d)\n", handle, smb_fname->base_name, mode); - - /* - * We need to do this due to the fact that the default POSIX ACL - * chmod modifies the ACL *mask* for the group owner, not the - * group owner bits directly. JRA. - */ - - - { - int saved_errno = errno; /* We might get ENOSYS */ - result = SMB_VFS_CHMOD_ACL(handle->conn, - smb_fname, - mode); - if (result == 0) { - return result; - } - /* Error - return the old errno. */ - errno = saved_errno; - } - result = ceph_chmod(handle->data, smb_fname->base_name, mode); DBG_DEBUG("[CEPH] chmod(...) = %d\n", result); WRAP_RETURN(result); -- 2.47.2