diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2009-06-10 11:36:43 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-06-10 11:36:43 -0400 |
| commit | 7df336ec1266dccbb253bac52c529d3dcc7c22d0 (patch) | |
| tree | f52acd46f2db0886669d18494a5e7e0f885b2fb5 /fs | |
| parent | 524724ed1f224875a117be593540591ed050c73d (diff) | |
Fix btrfs when ACLs are configured out
... otherwise generic_permission() will allow *anything* for all
files you don't own and that have some group permissions.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/acl.c | 5 | ||||
| -rw-r--r-- | fs/btrfs/ctree.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index cbba000dccb..603972576f0 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c @@ -351,9 +351,4 @@ int btrfs_init_acl(struct inode *inode, struct inode *dir) return 0; } -int btrfs_check_acl(struct inode *inode, int mask) -{ - return 0; -} - #endif /* CONFIG_FS_POSIX_ACL */ diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 4d6e0b6f21e..03441a99ea3 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -2301,7 +2301,11 @@ int btrfs_parse_options(struct btrfs_root *root, char *options); int btrfs_sync_fs(struct super_block *sb, int wait); /* acl.c */ +#ifdef CONFIG_FS_POSIX_ACL int btrfs_check_acl(struct inode *inode, int mask); +#else +#define btrfs_check_acl NULL +#endif int btrfs_init_acl(struct inode *inode, struct inode *dir); int btrfs_acl_chmod(struct inode *inode); |