aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/super.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ocfs2/super.c')
-rw-r--r--fs/ocfs2/super.c9
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,
1413 } 1413 }
1414 mopt->mount_opt |= OCFS2_MOUNT_GRPQUOTA; 1414 mopt->mount_opt |= OCFS2_MOUNT_GRPQUOTA;
1415 break; 1415 break;
1416#ifdef CONFIG_OCFS2_FS_POSIX_ACL
1417 case Opt_acl: 1416 case Opt_acl:
1418 mopt->mount_opt |= OCFS2_MOUNT_POSIX_ACL; 1417 mopt->mount_opt |= OCFS2_MOUNT_POSIX_ACL;
1419 break; 1418 break;
1420 case Opt_noacl: 1419 case Opt_noacl:
1421 mopt->mount_opt &= ~OCFS2_MOUNT_POSIX_ACL; 1420 mopt->mount_opt &= ~OCFS2_MOUNT_POSIX_ACL;
1422 break; 1421 break;
1423#else
1424 case Opt_acl:
1425 case Opt_noacl:
1426 printk(KERN_INFO "ocfs2 (no)acl options not supported\n");
1427 break;
1428#endif
1429 default: 1422 default:
1430 mlog(ML_ERROR, 1423 mlog(ML_ERROR,
1431 "Unrecognized mount option \"%s\" " 1424 "Unrecognized mount option \"%s\" "
@@ -1502,12 +1495,10 @@ static int ocfs2_show_options(struct seq_file *s, struct vfsmount *mnt)
1502 if (opts & OCFS2_MOUNT_INODE64) 1495 if (opts & OCFS2_MOUNT_INODE64)
1503 seq_printf(s, ",inode64"); 1496 seq_printf(s, ",inode64");
1504 1497
1505#ifdef CONFIG_OCFS2_FS_POSIX_ACL
1506 if (opts & OCFS2_MOUNT_POSIX_ACL) 1498 if (opts & OCFS2_MOUNT_POSIX_ACL)
1507 seq_printf(s, ",acl"); 1499 seq_printf(s, ",acl");
1508 else 1500 else
1509 seq_printf(s, ",noacl"); 1501 seq_printf(s, ",noacl");
1510#endif
1511 1502
1512 return 0; 1503 return 0;
1513} 1504}