On 2015-10-23 14:41, Andreas Gruenbacher wrote:
From: "Aneesh Kumar K.V" <aneesh.ku...@linux.vnet.ibm.com>

This feature flag selects richacl instead of posix acl support on the
file system. In addition, the "acl" mount option is needed for enabling
either of the two kinds of acls.

Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com>
Signed-off-by: Andreas Gruenbacher <agrue...@redhat.com>
---
  fs/ext4/ext4.h  |  6 ++++--
  fs/ext4/super.c | 49 ++++++++++++++++++++++++++++++++++++++++---------
  2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index fd1f28b..b97a3b1 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -991,7 +991,7 @@ struct ext4_inode_info {
  #define EXT4_MOUNT_UPDATE_JOURNAL     0x01000 /* Update the journal format */
  #define EXT4_MOUNT_NO_UID32           0x02000  /* Disable 32-bit UIDs */
  #define EXT4_MOUNT_XATTR_USER         0x04000 /* Extended user attributes */
-#define EXT4_MOUNT_POSIX_ACL           0x08000 /* POSIX Access Control Lists */
+#define EXT4_MOUNT_ACL                 0x08000 /* Access Control Lists */
  #define EXT4_MOUNT_NO_AUTO_DA_ALLOC   0x10000 /* No auto delalloc mapping */
  #define EXT4_MOUNT_BARRIER            0x20000 /* Use block barriers */
  #define EXT4_MOUNT_QUOTA              0x80000 /* Some quota option set */
@@ -1582,6 +1582,7 @@ static inline int ext4_encrypted_inode(struct inode 
*inode)
  #define EXT4_FEATURE_INCOMPAT_LARGEDIR                0x4000 /* >2GB or 3-lvl 
htree */
  #define EXT4_FEATURE_INCOMPAT_INLINE_DATA     0x8000 /* data in inode */
  #define EXT4_FEATURE_INCOMPAT_ENCRYPT         0x10000
+#define EXT4_FEATURE_INCOMPAT_RICHACL          0x20000

  #define EXT2_FEATURE_COMPAT_SUPP      EXT4_FEATURE_COMPAT_EXT_ATTR
  #define EXT2_FEATURE_INCOMPAT_SUPP    (EXT4_FEATURE_INCOMPAT_FILETYPE| \
@@ -1607,7 +1608,8 @@ static inline int ext4_encrypted_inode(struct inode 
*inode)
                                         EXT4_FEATURE_INCOMPAT_FLEX_BG| \
                                         EXT4_FEATURE_INCOMPAT_MMP | \
                                         EXT4_FEATURE_INCOMPAT_INLINE_DATA | \
-                                        EXT4_FEATURE_INCOMPAT_ENCRYPT)
+                                        EXT4_FEATURE_INCOMPAT_ENCRYPT | \
+                                        EXT4_FEATURE_INCOMPAT_RICHACL)
If this is going to be an incompat feature, the reasoning for that being the case should be clearly documented in either the changelog or the code itself. While the people involved in the discussion of this may understand the reasoning, that doesn't mean any arbitrary individual will at some point in the future, and documenting it properly will save time for people trying to figure out why this non-obvious choice was made.

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature

Reply via email to