summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbmilekic <bmilekic@FreeBSD.org>2004-04-29 15:10:42 +0000
committerbmilekic <bmilekic@FreeBSD.org>2004-04-29 15:10:42 +0000
commit97390ebf5517fc76379cc025008d6d0a64c6392c (patch)
tree212c67c32b8b32cd040c48e69eea48c09bb3ed9c /sys
parent8b17bc4875d955f6807bb0d9a8210e94bde31d0a (diff)
downloadFreeBSD-src-97390ebf5517fc76379cc025008d6d0a64c6392c.zip
FreeBSD-src-97390ebf5517fc76379cc025008d6d0a64c6392c.tar.gz
Revert previous change to this file because it breaks some
things which compare /etc/fstab entries to results from getfsstat(). The real way to fix this is to make 'ufs2' a recognized filesystem (for real, no beating around the bush). This should fix things like 'umount -a -t ufs' now. Appologies for the previous breakage.
Diffstat (limited to 'sys')
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 951f0eb..8f205db 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1062,9 +1062,6 @@ ffs_statfs(mp, sbp, td)
fs = ump->um_fs;
if (fs->fs_magic != FS_UFS1_MAGIC && fs->fs_magic != FS_UFS2_MAGIC)
panic("ffs_statfs");
- if (fs->fs_magic == FS_UFS2_MAGIC)
- bcopy((caddr_t)"ufs2",
- (caddr_t)&sbp->f_fstypename[0], MFSNAMELEN);
sbp->f_version = STATFS_VERSION;
sbp->f_bsize = fs->fs_fsize;
sbp->f_iosize = fs->fs_bsize;
@@ -1085,12 +1082,8 @@ ffs_statfs(mp, sbp, td)
sbp->f_asyncreads = mp->mnt_stat.f_asyncreads;
sbp->f_owner = mp->mnt_stat.f_owner;
sbp->f_fsid = mp->mnt_stat.f_fsid;
- if (fs->fs_magic == FS_UFS2_MAGIC)
- bcopy((caddr_t)"ufs2",
- (caddr_t)&sbp->f_fstypename[0], MFSNAMELEN);
- else
- bcopy((caddr_t)mp->mnt_stat.f_fstypename,
- (caddr_t)&sbp->f_fstypename[0], MFSNAMELEN);
+ bcopy((caddr_t)mp->mnt_stat.f_fstypename,
+ (caddr_t)&sbp->f_fstypename[0], MFSNAMELEN);
bcopy((caddr_t)mp->mnt_stat.f_mntonname,
(caddr_t)&sbp->f_mntonname[0], MNAMELEN);
bcopy((caddr_t)mp->mnt_stat.f_mntfromname,
OpenPOWER on IntegriCloud