Simplify check in zpl_permission()

Signed-off-by: Andrew Walker <awalker@ixsystems.com>
truenas · May 19, 2021 · d86fc0e · d86fc0e
1 parent 01cde40
commit d86fc0e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/module/os/linux/zfs/policy.c b/module/os/linux/zfs/policy.c
@@ -114,7 +114,7 @@ secpolicy_vnode_access2(const cred_t *cr, struct inode *ip, uid_t owner,
     mode_t curmode, mode_t wantmode)
 {
 	mode_t remainder = ~curmode & wantmode;
-	if (!(ITOZSB(ip)->z_acl_type == ZFS_ACLTYPE_NFSV4) ||
+	if ((ITOZSB(ip)->z_acl_type != ZFS_ACLTYPE_NFSV4) ||
 	    (remainder == 0)) {
 		return (0);
 	}

diff --git a/module/os/linux/zfs/zpl_xattr.c b/module/os/linux/zfs/zpl_xattr.c
@@ -115,7 +115,7 @@ static const struct {
 #endif
 };
 
-#define	GENERIC_MASK(mask) ((mask & ~(MAY_READ | MAY_WRITE | MAY_EXEC)) != 0)
+#define	GENERIC_MASK(mask) ((mask & ~(MAY_READ | MAY_WRITE | MAY_EXEC)) == 0)
 
 static int
 zpl_xattr_permission(xattr_filldir_t *xf, const char *name, int name_len)
@@ -1411,7 +1411,7 @@ zpl_permission(struct inode *ip, int mask)
 	cr = CRED();
 	crhold(cr);
 	ret = -zfs_access(ITOZ(ip), to_check, V_ACE_MASK, cr);
-	if (!((ret == -EPERM) || (ret == -EACCES))) {
+	if (ret != -EPERM && ret != -EACCES) {
 		crfree(cr);
 		return (ret);
 	}