Print this page
3742 zfs comments need cleaner, more consistent style
Submitted by:   Will Andrews <willa@spectralogic.com>
Submitted by:   Alan Somers <alans@spectralogic.com>
Reviewed by:    Matthew Ahrens <mahrens@delphix.com>
Reviewed by:    George Wilson <george.wilson@delphix.com>
Reviewed by:    Eric Schrock <eric.schrock@delphix.com>

@@ -1360,11 +1360,12 @@
         if (masks.allow0) {
                 zfs_set_ace(aclp, zacep, masks.allow0, ALLOW, -1, ACE_OWNER);
                 zacep = (void *)((uintptr_t)zacep + abstract_size);
                 new_count++;
                 new_bytes += abstract_size;
-        } if (masks.deny1) {
+        }
+        if (masks.deny1) {
                 zfs_set_ace(aclp, zacep, masks.deny1, DENY, -1, ACE_OWNER);
                 zacep = (void *)((uintptr_t)zacep + abstract_size);
                 new_count++;
                 new_bytes += abstract_size;
         }

@@ -1764,11 +1765,11 @@
         return (zfs_fuid_overquota(zfsvfs, B_FALSE, acl_ids->z_fuid) ||
             zfs_fuid_overquota(zfsvfs, B_TRUE, acl_ids->z_fgid));
 }
 
 /*
- * Retrieve a files ACL
+ * Retrieve a file's ACL
  */
 int
 zfs_getacl(znode_t *zp, vsecattr_t *vsecp, boolean_t skipaclchk, cred_t *cr)
 {
         zfs_acl_t       *aclp;

@@ -1919,11 +1920,11 @@
 
         return (0);
 }
 
 /*
- * Set a files ACL
+ * Set a file's ACL
  */
 int
 zfs_setacl(znode_t *zp, vsecattr_t *vsecp, boolean_t skipaclchk, cred_t *cr)
 {
         zfsvfs_t        *zfsvfs = zp->z_zfsvfs;

@@ -2340,10 +2341,11 @@
         return (error);
 }
 
 /*
  * Determine whether Access should be granted/denied.
+ *
  * The least priv subsytem is always consulted as a basic privilege
  * can define any form of access.
  */
 int
 zfs_zaccess(znode_t *zp, int mode, int flags, boolean_t skipaclchk, cred_t *cr)

@@ -2535,11 +2537,10 @@
 
 /*
  * Determine whether Access should be granted/deny, without
  * consulting least priv subsystem.
  *
- *
  * The following chart is the recommended NFSv4 enforcement for
  * ability to delete an object.
  *
  *      -------------------------------------------------------
  *      |   Parent Dir  |           Target Object Permissions |