vfs_gpfs: Remove merge_writeappend parameter

All supported GPFS versions now support setting WRITE and APPEND in the
ACLs independently. Remove this now unused parameter to simplify the
code.

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

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit 0aca678fcf1788a76cf0ff11399211c795aa7d2f)

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index d733df0aa5cf71289d4fd0b89e196b136bc8cf0d..63aeeddf7973d3f7556b701076b7aba764a31e62 100644 (file)
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -709,29 +709,6 @@ static struct gpfs_acl *vfs_gpfs_smbacl2gpfsacl(TALLOC_CTX *mem_ctx,
                gace->aceType = aceprop->aceType;
                gace->aceFlags = aceprop->aceFlags;
                gace->aceMask = aceprop->aceMask;
-
-               /*
-                * GPFS can't distinguish between WRITE and APPEND on
-                * files, so one being set without the other is an
-                * error. Sorry for the many ()'s :-)
-                */
-
-               if (!fsp->is_directory
-                   &&
-                   ((((gace->aceMask & ACE4_MASK_WRITE) == 0)
-                     && ((gace->aceMask & ACE4_MASK_APPEND) != 0))
-                    ||
-                    (((gace->aceMask & ACE4_MASK_WRITE) != 0)
-                     && ((gace->aceMask & ACE4_MASK_APPEND) == 0)))
-                   &&
-                   lp_parm_bool(fsp->conn->params->service, "gpfs",
-                                "merge_writeappend", True)) {
-                       DEBUG(2, ("vfs_gpfs.c: file [%s]: ACE contains "
-                                 "WRITE^APPEND, setting WRITE|APPEND\n",
-                                 fsp_str_dbg(fsp)));
-                       gace->aceMask |= ACE4_MASK_WRITE|ACE4_MASK_APPEND;
-               }
-
                gace->aceIFlags = (aceprop->flags&SMB_ACE4_ID_SPECIAL) ? ACE4_IFLAG_SPECIAL_ID : 0;
 
                if (aceprop->flags&SMB_ACE4_ID_SPECIAL)