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.
This commit is contained in:
parent
7759bbaa3c
commit
6c258b9a90
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user