diff options
| author | Jan Kara <jack@suse.cz> | 2009-10-15 16:54:03 +0400 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2009-10-29 09:05:57 +0300 |
| commit | e6aabe0cac14a495d42f629a803c5e221089bae8 (patch) | |
| tree | 39972946024d893ecbdcdbb30447bdb5b9fc5201 /fs/ocfs2/acl.h | |
| parent | 2f48d593b6ceb7bb63d34124ceba77d33be298cf (diff) | |
| download | linux-e6aabe0cac14a495d42f629a803c5e221089bae8.tar.xz | |
ocfs2: Always include ACL support
To become consistent with filesystems such as XFS or BTRFS, make posix
ACLs always available. This also reduces possibility of
misconfiguration on admin's side.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/acl.h')
| -rw-r--r-- | fs/ocfs2/acl.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/fs/ocfs2/acl.h b/fs/ocfs2/acl.h index 8f6389ed4da5..5c5d31f05853 100644 --- a/fs/ocfs2/acl.h +++ b/fs/ocfs2/acl.h @@ -26,8 +26,6 @@ struct ocfs2_acl_entry { __le32 e_id; }; -#ifdef CONFIG_OCFS2_FS_POSIX_ACL - extern int ocfs2_check_acl(struct inode *, int); extern int ocfs2_acl_chmod(struct inode *); extern int ocfs2_init_acl(handle_t *, struct inode *, struct inode *, @@ -35,24 +33,4 @@ extern int ocfs2_init_acl(handle_t *, struct inode *, struct inode *, struct ocfs2_alloc_context *, struct ocfs2_alloc_context *); -#else /* CONFIG_OCFS2_FS_POSIX_ACL*/ - -#define ocfs2_check_acl NULL -static inline int ocfs2_acl_chmod(struct inode *inode) -{ - return 0; -} -static inline int ocfs2_init_acl(handle_t *handle, - struct inode *inode, - struct inode *dir, - struct buffer_head *di_bh, - struct buffer_head *dir_bh, - struct ocfs2_alloc_context *meta_ac, - struct ocfs2_alloc_context *data_ac) -{ - return 0; -} - -#endif /* CONFIG_OCFS2_FS_POSIX_ACL*/ - #endif /* OCFS2_ACL_H */ |