From a43d14a3d5ca47ccce5d64a7704f5fe528237f84 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 22 Jan 2015 12:15:47 -0500 Subject: ext4: disable ext4 acl handling for 3.18 backport The ACL code changes too much between 3.18 and 3.10; so disable acl handling so we don't have make things actually work. Signed-off-by: Theodore Ts'o --- fs/ext4/inode.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 3356ab539..869fccf38 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4578,8 +4578,11 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr) if (orphan && inode->i_nlink) ext4_orphan_del(NULL, inode); +#ifdef CONFIG_EXT4_FS_POSIX_ACL +#error POSIX_ACL not supported in 3.18 backport if (!rc && (ia_valid & ATTR_MODE)) rc = posix_acl_chmod(inode, inode->i_mode); +#endif err_out: ext4_std_error(inode->i_sb, error); -- cgit v1.2.3