diff options
-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 cbba000dccbe..603972576f0f 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) | |||
351 | return 0; | 351 | return 0; |
352 | } | 352 | } |
353 | 353 | ||
354 | int btrfs_check_acl(struct inode *inode, int mask) | ||
355 | { | ||
356 | return 0; | ||
357 | } | ||
358 | |||
359 | #endif /* CONFIG_FS_POSIX_ACL */ | 354 | #endif /* CONFIG_FS_POSIX_ACL */ |
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 4d6e0b6f21ea..03441a99ea38 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); | |||
2301 | int btrfs_sync_fs(struct super_block *sb, int wait); | 2301 | int btrfs_sync_fs(struct super_block *sb, int wait); |
2302 | 2302 | ||
2303 | /* acl.c */ | 2303 | /* acl.c */ |
2304 | #ifdef CONFIG_FS_POSIX_ACL | ||
2304 | int btrfs_check_acl(struct inode *inode, int mask); | 2305 | int btrfs_check_acl(struct inode *inode, int mask); |
2306 | #else | ||
2307 | #define btrfs_check_acl NULL | ||
2308 | #endif | ||
2305 | int btrfs_init_acl(struct inode *inode, struct inode *dir); | 2309 | int btrfs_init_acl(struct inode *inode, struct inode *dir); |
2306 | int btrfs_acl_chmod(struct inode *inode); | 2310 | int btrfs_acl_chmod(struct inode *inode); |
2307 | 2311 | ||