hfsplus: drop ACL support
Subsystems (2)
PATCH 1/1 hfsplus: drop ACL support
The HFS+ Access Control Lists have not been working at all for the past four years, and nobody seems to have noticed. Besides, they are not compatible with MacOS. Drop the feature entirely.
Signed-off-by Ernesto A. Fernández <[email protected]>
--- fs/hfsplus/Kconfig | 18 ------ fs/hfsplus/Makefile | 2 - fs/hfsplus/acl.h | 28 --------- fs/hfsplus/dir.c | 9 +-- fs/hfsplus/hfsplus_fs.h | 1 - fs/hfsplus/inode.c | 11 ---- fs/hfsplus/posix_acl.c | 144 -------------------------------------------- fs/hfsplus/super.c | 4 +- fs/hfsplus/xattr.c | 6 -- fs/hfsplus/xattr.h | 3 - fs/hfsplus/xattr_security.c | 13 ---- 11 files changed, 4 insertions(+), 235 deletions(-) delete mode 100644 fs/hfsplus/acl.h delete mode 100644 fs/hfsplus/posix_acl.c
fs/hfsplus/Kconfig +0 -18
@@ -11,21 +11,3 @@ config HFSPLUS_FS MacOS 8. It includes all Mac specific filesystem data such as data forks and creator codes, but it also has several UNIX style features such as file ownership and permissions. - -config HFSPLUS_FS_POSIX_ACL - bool "HFS+ POSIX Access Control Lists" - depends on HFSPLUS_FS - select FS_POSIX_ACL - help - POSIX Access Control Lists (ACLs) support permissions for users and - groups beyond the owner/group/world scheme. - - To learn more about Access Control Lists, visit the POSIX ACLs for - Linux website <http://acl.bestbits.at/>. - - It needs to understand that POSIX ACLs are treated only under - Linux. POSIX ACLs doesn't mean something under Mac OS X. - Mac OS X beginning with version 10.4 ("Tiger") support NFSv4 ACLs, - which are part of the NFSv4 standard. - - If you don't know what Access Control Lists are, say N
fs/hfsplus/Makefile +0 -2
@@ -8,5 +8,3 @@ obj-$(CONFIG_HFSPLUS_FS) += hfsplus.o hfsplus-objs := super.o options.o inode.o ioctl.o extents.o catalog.o dir.o btree.o \ bnode.o brec.o bfind.o tables.o unicode.o wrapper.o bitmap.o part_tbl.o \ attributes.o xattr.o xattr_user.o xattr_security.o xattr_trusted.o - -hfsplus-$(CONFIG_HFSPLUS_FS_POSIX_ACL) += posix_acl.o
fs/hfsplus/acl.h deleted +0 -28
@@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* linux/fs/hfsplus/acl.h -* -* Vyacheslav Dubeyko <[email protected]> -* -* Handler for Posix Access Control Lists (ACLs) support. -*/ - -#include <linux/posix_acl_xattr.h> - -#ifdef CONFIG_HFSPLUS_FS_POSIX_ACL - -/* posix_acl.c */ -struct posix_acl *hfsplus_get_posix_acl (struct inode *inode,int type); -int hfsplus_set_posix_acl (struct inode *inode,struct posix_acl *acl, -int type); -extern int hfsplus_init_posix_acl (struct inode *,struct inode *); - -#else /* CONFIG_HFSPLUS_FS_POSIX_ACL */ -#define hfsplus_get_posix_acl NULL -#define hfsplus_set_posix_acl NULL - -static inline int hfsplus_init_posix_acl (struct inode *inode,struct inode *dir) -{ -return 0 ; -} -#endif /* CONFIG_HFSPLUS_FS_POSIX_ACL */
fs/hfsplus/dir.c +2 -7
@@ -18,7 +18,6 @@#include "hfsplus_fs.h" #include "hfsplus_raw.h" #include "xattr.h" -#include "acl.h" static inline void hfsplus_instantiate (struct dentry *dentry,struct inode *inode,u32 cnid)
@@ -456,7 +455,7 @@ static int hfsplus_symlink(struct inode *dir, struct dentry *dentry,if (res) goto out_err; - res =hfsplus_init_inode_security (inode, dir, &dentry->d_name); + res =hfsplus_init_security (inode, dir, &dentry->d_name);if (res == -EOPNOTSUPP ) res =0 ;/* Operation is not supported. */ else if (res) {
@@ -497,7 +496,7 @@ static int hfsplus_mknod(struct inode *dir, struct dentry *dentry,if (res) goto failed_mknod; - res =hfsplus_init_inode_security (inode, dir, &dentry->d_name); + res =hfsplus_init_security (inode, dir, &dentry->d_name);if (res == -EOPNOTSUPP ) res =0 ;/* Operation is not supported. */ else if (res) {
@@ -568,10 +567,6 @@ const struct inode_operations hfsplus_dir_inode_operations = { .mknod = hfsplus_mknod, .rename = hfsplus_rename, .listxattr = hfsplus_listxattr, -#ifdef CONFIG_HFSPLUS_FS_POSIX_ACL - .get_acl = hfsplus_get_posix_acl, - .set_acl = hfsplus_set_posix_acl, -#endif };const struct file_operations hfsplus_dir_operations = {
fs/hfsplus/hfsplus_fs.h +0 -1
@@ -31,7 +31,6 @@#define DBG_EXTENT 0x00000020#define DBG_BITMAP 0x00000040#define DBG_ATTR_MOD 0x00000080 -#define DBG_ACL_MOD 0x00000100#if 0 #define DBG_MASK (DBG_EXTENT|DBG_INODE|DBG_BNODE_MOD)
fs/hfsplus/inode.c +0 -11
@@ -21,7 +21,6 @@#include "hfsplus_fs.h" #include "hfsplus_raw.h" #include "xattr.h" -#include "acl.h" static int hfsplus_readpage (struct file *file,struct page *page) {
@@ -267,12 +266,6 @@ static int hfsplus_setattr(struct dentry *dentry, struct iattr *attr)setattr_copy (inode, attr);mark_inode_dirty (inode); -if (attr->ia_valid &ATTR_MODE ) { - error =posix_acl_chmod (inode, inode->i_mode); -if (unlikely (error)) -return error; - } -return 0 ; }
@@ -336,10 +329,6 @@ int hfsplus_file_fsync(struct file *file, loff_t start, loff_t end,static const struct inode_operations hfsplus_file_inode_operations = { .setattr = hfsplus_setattr, .listxattr = hfsplus_listxattr, -#ifdef CONFIG_HFSPLUS_FS_POSIX_ACL - .get_acl = hfsplus_get_posix_acl, - .set_acl = hfsplus_set_posix_acl, -#endif };static const struct file_operations hfsplus_file_operations = {
fs/hfsplus/posix_acl.c deleted +0 -144
144 lines not on this page · raw message
fs/hfsplus/super.c +2 -2
@@ -562,8 +562,8 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent) goto out_put_hidden_dir; } - err =hfsplus_init_inode_security (sbi->hidden_dir, - root, &str); + err =hfsplus_init_security (sbi->hidden_dir, + root, &str);if (err == -EOPNOTSUPP ) err =0 ;/* Operation is not supported. */ else if (err) {
fs/hfsplus/xattr.c +0 -6
@@ -8,10 +8,8 @@*/ #include "hfsplus_fs.h" -#include <linux/posix_acl_xattr.h> #include <linux/nls.h> #include "xattr.h" -#include "acl.h" static int hfsplus_removexattr (struct inode *inode,const char *name);
@@ -19,10 +17,6 @@ const struct xattr_handler *hfsplus_xattr_handlers[] = { &hfsplus_xattr_osx_handler, &hfsplus_xattr_user_handler, &hfsplus_xattr_trusted_handler, -#ifdef CONFIG_HFSPLUS_FS_POSIX_ACL - &posix_acl_access_xattr_handler, - &posix_acl_default_xattr_handler, -#endif &hfsplus_xattr_security_handler, NULL };
fs/hfsplus/xattr.h +0 -3
@@ -38,7 +38,4 @@ ssize_t hfsplus_listxattr(struct dentry *dentry, char *buffer, size_t size);int hfsplus_init_security (struct inode *inode,struct inode *dir,const struct qstr *qstr); -int hfsplus_init_inode_security (struct inode *inode,struct inode *dir, -const struct qstr *qstr); -#endif
fs/hfsplus/xattr_security.c +0 -13
@@ -12,7 +12,6 @@#include "hfsplus_fs.h" #include "xattr.h" -#include "acl.h" static int hfsplus_security_getxattr(const struct xattr_handler *handler, struct dentry *unused, struct inode *inode,
@@ -72,18 +71,6 @@ int hfsplus_init_security(struct inode *inode, struct inode *dir, &hfsplus_initxattrs, NULL); } -int hfsplus_init_inode_security (struct inode *inode, -struct inode *dir, -const struct qstr *qstr) -{ -int err; - - err =hfsplus_init_posix_acl (inode, dir); -if (!err) - err =hfsplus_init_security (inode, dir, qstr); -return err; -} -const struct xattr_handler hfsplus_xattr_security_handler = { .prefix =XATTR_SECURITY_PREFIX , .get = hfsplus_security_getxattr,
Signature · 1 line
2.1.4
Viacheslav Dubeyko
maintainerQuoted 5 lines · Ernesto A. Fernández
The HFS+ Access Control Lists have not been working at all for the past
four years, and nobody seems to have noticed. Besides, they are not compatible with MacOS. Drop the feature entirely.
If we have some bugs then it makes sense to fix the bugs. The simple deletion is the wrong way. Moreover, it needs to modify this support for richacls level because HFS+ ACLs model is based on NFSv4 ACLs.
Thanks,
Vyacheslav Dubeyko.