From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Dilger Subject: Re: [PATCH v14 22/22] ext4: Add richacl feature flag Date: Sun, 8 Nov 2015 01:12:48 -0700 Message-ID: References: <1446723580-3747-1-git-send-email-agruenba@redhat.com> <1446723580-3747-23-git-send-email-agruenba@redhat.com> Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Content-Type: multipart/mixed; boundary="===============2133347517915251200==" Cc: linux-cifs@vger.kernel.org, Linux NFS Mailing List , Theodore Ts'o , Linux API , Trond Myklebust , LKML , XFS Developers , "J. Bruce Fields" , Alexander Viro , linux-fsdevel , Jeff Layton , linux-ext4 , Anna Schumaker , "Aneesh Kumar K.V" To: Andreas Gruenbacher Return-path: In-Reply-To: <1446723580-3747-23-git-send-email-agruenba@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com List-Id: linux-fsdevel.vger.kernel.org --===============2133347517915251200== Content-Type: multipart/signed; boundary="Apple-Mail=_0BCACE90-E476-493B-B86E-BCA15FCFDC21"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Apple-Mail=_0BCACE90-E476-493B-B86E-BCA15FCFDC21 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On Nov 5, 2015, at 4:39 AM, Andreas Gruenbacher = wrote: >=20 > From: "Aneesh Kumar K.V" >=20 > This feature flag selects richacl instead of POSIX ACL support on the > filesystem. When this feature is off, the "acl" and "noacl" mount = options > control whether POSIX ACLs are enabled. When it is on, richacls are > automatically enabled and using the "noacl" mount option leads to an = error. >=20 > Signed-off-by: Aneesh Kumar K.V > Signed-off-by: Andreas Gruenbacher Reviewed-by: Andreas Dilger > --- > fs/ext4/ext4.h | 6 ++++-- > fs/ext4/super.c | 49 ++++++++++++++++++++++++++++++++++++++++--------- > 2 files changed, 44 insertions(+), 11 deletions(-) >=20 > 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 >=20 > #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) > #define EXT4_FEATURE_RO_COMPAT_SUPP = (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \ > = EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \ > = EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \ > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index a63c7b0..7457ea8 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -1270,6 +1270,28 @@ static ext4_fsblk_t get_sb_block(void **data) > return sb_block; > } >=20 > +static int enable_acl(struct super_block *sb) > +{ > + sb->s_flags &=3D ~(MS_POSIXACL | MS_RICHACL); > + if (test_opt(sb, ACL)) { > + if (EXT4_HAS_INCOMPAT_FEATURE(sb, > + = EXT4_FEATURE_INCOMPAT_RICHACL)) { > +#ifdef CONFIG_EXT4_FS_RICHACL > + sb->s_flags |=3D MS_RICHACL; > +#else > + return -EOPNOTSUPP; > +#endif > + } else { > +#ifdef CONFIG_EXT4_FS_POSIX_ACL > + sb->s_flags |=3D MS_POSIXACL; > +#else > + return -EOPNOTSUPP; > +#endif > + } > + } > + return 0; > +} > + > #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3)) > static char deprecated_msg[] =3D "Mount option \"%s\" will be removed = by %s\n" > "Contact linux-ext4@vger.kernel.org if you think we should keep = it.\n"; > @@ -1416,9 +1438,9 @@ static const struct mount_opts { > MOPT_NO_EXT2 | MOPT_DATAJ}, > {Opt_user_xattr, EXT4_MOUNT_XATTR_USER, MOPT_SET}, > {Opt_nouser_xattr, EXT4_MOUNT_XATTR_USER, MOPT_CLEAR}, > -#ifdef CONFIG_EXT4_FS_POSIX_ACL > - {Opt_acl, EXT4_MOUNT_POSIX_ACL, MOPT_SET}, > - {Opt_noacl, EXT4_MOUNT_POSIX_ACL, MOPT_CLEAR}, > +#if defined(CONFIG_EXT4_FS_POSIX_ACL) || = defined(CONFIG_EXT4_FS_RICHACL) > + {Opt_acl, EXT4_MOUNT_ACL, MOPT_SET}, > + {Opt_noacl, EXT4_MOUNT_ACL, MOPT_CLEAR}, > #else > {Opt_acl, 0, MOPT_NOSUPPORT}, > {Opt_noacl, 0, MOPT_NOSUPPORT}, > @@ -1466,6 +1488,13 @@ static int handle_mount_opt(struct super_block = *sb, char *opt, int token, > #endif > switch (token) { > case Opt_noacl: > +#ifdef CONFIG_EXT4_FS_RICHACL > + if (EXT4_HAS_INCOMPAT_FEATURE(sb, = EXT4_FEATURE_INCOMPAT_RICHACL)) { > + ext4_msg(sb, KERN_ERR, "Mount option \"%s\" incompatible = " > + "with richacl feature", opt); > + return -1; > + } > +#endif > case Opt_nouser_xattr: > ext4_msg(sb, KERN_WARNING, deprecated_msg, opt, "3.5"); > break; > @@ -3576,8 +3605,8 @@ static int ext4_fill_super(struct super_block = *sb, void *data, int silent) > set_opt(sb, NO_UID32); > /* xattr user namespace & acls are now defaulted on */ > set_opt(sb, XATTR_USER); > -#ifdef CONFIG_EXT4_FS_POSIX_ACL > - set_opt(sb, POSIX_ACL); > +#if defined(CONFIG_EXT4_FS_POSIX_ACL) || = defined(CONFIG_EXT4_FS_RICHACL) > + set_opt(sb, ACL); > #endif > /* don't forget to enable journal_csum when metadata_csum is = enabled. */ > if (ext4_has_metadata_csum(sb)) > @@ -3660,8 +3689,9 @@ static int ext4_fill_super(struct super_block = *sb, void *data, int silent) > sb->s_iflags |=3D SB_I_CGROUPWB; > } >=20 > - sb->s_flags =3D (sb->s_flags & ~MS_POSIXACL) | > - (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); > + err =3D enable_acl(sb); > + if (err) > + goto failed_mount; >=20 > if (le32_to_cpu(es->s_rev_level) =3D=3D EXT4_GOOD_OLD_REV && > (EXT4_HAS_COMPAT_FEATURE(sb, ~0U) || > @@ -4981,8 +5011,9 @@ static int ext4_remount(struct super_block *sb, = int *flags, char *data) > if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) > ext4_abort(sb, "Abort forced by user"); >=20 > - sb->s_flags =3D (sb->s_flags & ~MS_POSIXACL) | > - (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); > + err =3D enable_acl(sb); > + if (err) > + goto restore_opts; >=20 > es =3D sbi->s_es; >=20 > -- > 2.5.0 >=20 Cheers, Andreas --Apple-Mail=_0BCACE90-E476-493B-B86E-BCA15FCFDC21 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - http://gpgtools.org iQIVAwUBVj8EAXKl2rkXzB/gAQgbOxAAgr/EeWdcnvF/SjAMimIladAt5mlkUjW9 UTtWj5C3xO7NTPmH28K3HG42mKT0WsP+ltiCDeB9VFhodLaRkykv4LhrWY0bbnZV tgmMthacKyWL+CUES9Ol1OzE2flm8KrSgSXWslTTbUsBN0dHuMPc1CJNrcs3MP0C wqaEZEzUdOBxkhZJXJco3oBMMfuoaQRi5XbcgF0ItXLY3w7z+3kXkGMaYslMW/FN NO6O+ycxbRTTQgWBI61vGFV8dOC6lGZE+1j7+ZrESmhJDGfY+dLw3IALwEMQSPCa ZT/6fX4f5fla78+hFLUM1Vkjxa8qPSjw/4en8zbNV+Kkv9j3fTRyGTjbT5e5UkUm o5hnBWKO5eESGRdTi9Nji8I06iy/1DhnazQnROmGhUrNBTUjT6OWuxWGIJ0l8iJR mVS98xlZbPZ8VCWpRBW0TwMkcs7Odo0TYry94vMjbvhBY/DrqiGFx0Rk7Pv7leHt iKnXMuEKGTZFBmApFDaTYlJYhc6eHxC1grEfUujriw0z9r6CLVr5tp+oggPP7wwv 4APOthWXoDIQV6kuujVlLaoQPP0pct/Yt6LCFIFqEUgsTfQlyQBguUnqefkH5nzS fWWdIs69SI8fcVPDg9KFZ7HdTvMWcutN1ijyhvZS3bEAFp6SgmI5+F55A5fTxTjH jpvgOQxlT9Y= =0MG+ -----END PGP SIGNATURE----- --Apple-Mail=_0BCACE90-E476-493B-B86E-BCA15FCFDC21-- --===============2133347517915251200== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs --===============2133347517915251200==--