diff options
| author | trhodes <trhodes@FreeBSD.org> | 2006-04-21 07:14:25 +0000 |
|---|---|---|
| committer | trhodes <trhodes@FreeBSD.org> | 2006-04-21 07:14:25 +0000 |
| commit | cf75387e3b115630104335cd25f28d4cc7e2ce3e (patch) | |
| tree | c21540ae0b4017230e5a1f289b12025a4236ed30 | |
| parent | a4fa6c67c34423848daa7b0e4b09c2838a7384b0 (diff) | |
| download | FreeBSD-src-cf75387e3b115630104335cd25f28d4cc7e2ce3e.zip FreeBSD-src-cf75387e3b115630104335cd25f28d4cc7e2ce3e.tar.gz | |
Remove what I believe are two useless ifdefs. If a user or administrator
enables multilabel, or any option for that matter, most likely they have
a reason. This will allow users to see that mulilabel is enabled via an
issued "mount" command and remove an annoying warning - printed only when
a MAC kernel is not installed - on boot up.
Discussed with: green, brueffer, Samy Al Bahra.
Probably ran past: csjp (though I can't remember).
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 0d8372a..8075bb1 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -760,21 +760,9 @@ ffs_mountfs(devvp, mp, td) mp->mnt_maxsymlinklen = fs->fs_maxsymlinklen; mp->mnt_flag |= MNT_LOCAL; if ((fs->fs_flags & FS_MULTILABEL) != 0) -#ifdef MAC mp->mnt_flag |= MNT_MULTILABEL; -#else - printf( -"WARNING: %s: multilabel flag on fs but no MAC support\n", - fs->fs_fsmnt); -#endif if ((fs->fs_flags & FS_ACLS) != 0) -#ifdef UFS_ACL mp->mnt_flag |= MNT_ACLS; -#else - printf( -"WARNING: %s: ACLs flag on fs but no ACLs support\n", - fs->fs_fsmnt); -#endif ump->um_mountp = mp; ump->um_dev = dev; ump->um_devvp = devvp; |
