diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2011-07-13 23:17:39 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2011-08-01 14:30:48 -0400 |
commit | 9b89d95a143bb0a9abc4ba0fdcdda78211930f1a (patch) | |
tree | 353768825b985753b23fda0ec88e7cc85bf83346 /fs/btrfs/acl.c | |
parent | 15de900d08bb132833c8622610ddb1be660a6018 (diff) |
Btrfs: make acl functions really no-op if acl is not enabled
So there's no overhead for something we don't use.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/acl.c')
-rw-r--r-- | fs/btrfs/acl.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index f66fc9959733..b206d4c2720b 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c | |||
@@ -28,8 +28,6 @@ | |||
28 | #include "btrfs_inode.h" | 28 | #include "btrfs_inode.h" |
29 | #include "xattr.h" | 29 | #include "xattr.h" |
30 | 30 | ||
31 | #ifdef CONFIG_BTRFS_FS_POSIX_ACL | ||
32 | |||
33 | static struct posix_acl *btrfs_get_acl(struct inode *inode, int type) | 31 | static struct posix_acl *btrfs_get_acl(struct inode *inode, int type) |
34 | { | 32 | { |
35 | int size; | 33 | int size; |
@@ -318,18 +316,3 @@ const struct xattr_handler btrfs_xattr_acl_access_handler = { | |||
318 | .get = btrfs_xattr_acl_get, | 316 | .get = btrfs_xattr_acl_get, |
319 | .set = btrfs_xattr_acl_set, | 317 | .set = btrfs_xattr_acl_set, |
320 | }; | 318 | }; |
321 | |||
322 | #else /* CONFIG_BTRFS_FS_POSIX_ACL */ | ||
323 | |||
324 | int btrfs_acl_chmod(struct inode *inode) | ||
325 | { | ||
326 | return 0; | ||
327 | } | ||
328 | |||
329 | int btrfs_init_acl(struct btrfs_trans_handle *trans, | ||
330 | struct inode *inode, struct inode *dir) | ||
331 | { | ||
332 | return 0; | ||
333 | } | ||
334 | |||
335 | #endif /* CONFIG_BTRFS_FS_POSIX_ACL */ | ||