aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOmar Sandoval <osandov@fb.com>2017-01-25 20:06:40 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-01 02:33:06 -0500
commitffb97c11d05fea9a3ff29ad1d9e9c854e0a06dc2 (patch)
tree488206f87f24fc13b3604d11017d1e64b01d785f
parentad80fada9d6d8177d1593a9b5772e80a758db595 (diff)
Btrfs: remove ->{get, set}_acl() from btrfs_dir_ro_inode_operations
commit 57b59ed2e5b91e958843609c7884794e29e6c4cb upstream. Subvolume directory inodes can't have ACLs. Signed-off-by: Omar Sandoval <osandov@fb.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: Chris Mason <clm@fb.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/btrfs/inode.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 68fed83dc742..be4da91d880f 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -10585,8 +10585,6 @@ static const struct inode_operations btrfs_dir_inode_operations = {
10585static const struct inode_operations btrfs_dir_ro_inode_operations = { 10585static const struct inode_operations btrfs_dir_ro_inode_operations = {
10586 .lookup = btrfs_lookup, 10586 .lookup = btrfs_lookup,
10587 .permission = btrfs_permission, 10587 .permission = btrfs_permission,
10588 .get_acl = btrfs_get_acl,
10589 .set_acl = btrfs_set_acl,
10590 .update_time = btrfs_update_time, 10588 .update_time = btrfs_update_time,
10591}; 10589};
10592 10590