From 55f013edbb10cf68289ea23f674af617edcc12ad Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 17 May 2018 11:46:21 -0700 Subject: [PATCH] s3: modules: vfs_ceph: Remove FCHMOD_ACL in cephwrap_fchmod(). 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 | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c index 818d0cb5490..b6ca27dd47e 100644 --- a/source3/modules/vfs_ceph.c +++ b/source3/modules/vfs_ceph.c @@ -957,21 +957,6 @@ static int cephwrap_fchmod(struct vfs_handle_struct *handle, files_struct *fsp, DBG_DEBUG("[CEPH] fchmod(%p, %p, %d)\n", handle, fsp, 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 */ - if ((result = SMB_VFS_FCHMOD_ACL(fsp, mode)) == 0) { - return result; - } - /* Error - return the old errno. */ - errno = saved_errno; - } - #if defined(HAVE_FCHMOD) result = ceph_fchmod(handle->data, fsp->fh->fd, mode); DBG_DEBUG("[CEPH] fchmod(...) = %d\n", result);