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/super.c | |
| parent | 2f48d593b6ceb7bb63d34124ceba77d33be298cf (diff) | |
| download | blackbird-op-linux-e6aabe0cac14a495d42f629a803c5e221089bae8.tar.gz blackbird-op-linux-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/super.c')
| -rw-r--r-- | fs/ocfs2/super.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 960673004df1..da7d33a57cf6 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -1413,19 +1413,12 @@ static int ocfs2_parse_options(struct super_block *sb, } mopt->mount_opt |= OCFS2_MOUNT_GRPQUOTA; break; -#ifdef CONFIG_OCFS2_FS_POSIX_ACL case Opt_acl: mopt->mount_opt |= OCFS2_MOUNT_POSIX_ACL; break; case Opt_noacl: mopt->mount_opt &= ~OCFS2_MOUNT_POSIX_ACL; break; -#else - case Opt_acl: - case Opt_noacl: - printk(KERN_INFO "ocfs2 (no)acl options not supported\n"); - break; -#endif default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " @@ -1502,12 +1495,10 @@ static int ocfs2_show_options(struct seq_file *s, struct vfsmount *mnt) if (opts & OCFS2_MOUNT_INODE64) seq_printf(s, ",inode64"); -#ifdef CONFIG_OCFS2_FS_POSIX_ACL if (opts & OCFS2_MOUNT_POSIX_ACL) seq_printf(s, ",acl"); else seq_printf(s, ",noacl"); -#endif return 0; } |
