diff options
| author | Jan Kara <jack@suse.cz> | 2009-10-15 14:54:03 +0200 |
|---|---|---|
| committer | Joel Becker <joel.becker@oracle.com> | 2009-10-28 23:05:57 -0700 |
| commit | e6aabe0cac14a495d42f629a803c5e221089bae8 (patch) | |
| tree | 39972946024d893ecbdcdbb30447bdb5b9fc5201 /fs/ocfs2/xattr.c | |
| parent | 2f48d593b6ceb7bb63d34124ceba77d33be298cf (diff) | |
| download | linux-3.10-e6aabe0cac14a495d42f629a803c5e221089bae8.tar.gz linux-3.10-e6aabe0cac14a495d42f629a803c5e221089bae8.tar.bz2 linux-3.10-e6aabe0cac14a495d42f629a803c5e221089bae8.zip | |
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/xattr.c')
| -rw-r--r-- | fs/ocfs2/xattr.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c index fe3419068df..923e950e544 100644 --- a/fs/ocfs2/xattr.c +++ b/fs/ocfs2/xattr.c @@ -98,10 +98,8 @@ static struct ocfs2_xattr_def_value_root def_xv = { struct xattr_handler *ocfs2_xattr_handlers[] = { &ocfs2_xattr_user_handler, -#ifdef CONFIG_OCFS2_FS_POSIX_ACL &ocfs2_xattr_acl_access_handler, &ocfs2_xattr_acl_default_handler, -#endif &ocfs2_xattr_trusted_handler, &ocfs2_xattr_security_handler, NULL @@ -109,12 +107,10 @@ struct xattr_handler *ocfs2_xattr_handlers[] = { static struct xattr_handler *ocfs2_xattr_handler_map[OCFS2_XATTR_MAX] = { [OCFS2_XATTR_INDEX_USER] = &ocfs2_xattr_user_handler, -#ifdef CONFIG_OCFS2_FS_POSIX_ACL [OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS] = &ocfs2_xattr_acl_access_handler, [OCFS2_XATTR_INDEX_POSIX_ACL_DEFAULT] = &ocfs2_xattr_acl_default_handler, -#endif [OCFS2_XATTR_INDEX_TRUSTED] = &ocfs2_xattr_trusted_handler, [OCFS2_XATTR_INDEX_SECURITY] = &ocfs2_xattr_security_handler, }; |