| From d00c47538346962de2d2607baf5f01e3e08decba Mon Sep 17 00:00:00 2001 |
| From: Omar Sandoval <osandov@fb.com> |
| Date: Wed, 25 Jan 2017 17:06:40 -0800 |
| Subject: [PATCH] Btrfs: remove ->{get, set}_acl() from |
| btrfs_dir_ro_inode_operations |
| |
| commit 57b59ed2e5b91e958843609c7884794e29e6c4cb upstream. |
| |
| Subvolume directory inodes can't have ACLs. |
| |
| Cc: <stable@vger.kernel.org> # 4.9.x |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c |
| index 34bc5753a14f..6daacfcbf00c 100644 |
| --- a/fs/btrfs/inode.c |
| +++ b/fs/btrfs/inode.c |
| @@ -10585,8 +10585,6 @@ static const struct inode_operations btrfs_dir_inode_operations = { |
| static const struct inode_operations btrfs_dir_ro_inode_operations = { |
| .lookup = btrfs_lookup, |
| .permission = btrfs_permission, |
| - .get_acl = btrfs_get_acl, |
| - .set_acl = btrfs_set_acl, |
| .update_time = btrfs_update_time, |
| }; |
| |
| -- |
| 2.10.1 |
| |