From cc1730771008ddc8f1bccc5ed3aa8a987856137e Mon Sep 17 00:00:00 2001 From: Kirk McKusick Date: Sun, 15 Dec 1991 05:35:50 -0800 Subject: [PATCH] statfs.f_bsize => statfs.f_iosize; statfs.f_fsize => statfs.f_bsize (for SunOS) SCCS-vsn: sys/ufs/lfs/lfs_vfsops.c 7.67 SCCS-vsn: sys/ufs/ffs/ufs_lookup.c 7.36 SCCS-vsn: sys/ufs/ufs/ufs_lookup.c 7.36 SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.69 SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.69 SCCS-vsn: sys/dev/vn.c 7.7 SCCS-vsn: bin/df/df.c 5.27 --- usr/src/bin/df/df.c | 12 ++++++------ usr/src/sys/dev/vn.c | 4 ++-- usr/src/sys/ufs/ffs/ufs_lookup.c | 6 +++--- usr/src/sys/ufs/ffs/ufs_vnops.c | 6 +++--- usr/src/sys/ufs/lfs/lfs_vfsops.c | 4 ++-- usr/src/sys/ufs/ufs/ufs_lookup.c | 6 +++--- usr/src/sys/ufs/ufs/ufs_vnops.c | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/usr/src/bin/df/df.c b/usr/src/bin/df/df.c index 3f96be780f..d21f7974b5 100644 --- a/usr/src/bin/df/df.c +++ b/usr/src/bin/df/df.c @@ -12,7 +12,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char sccsid[] = "@(#)df.c 5.26 (Berkeley) %G%"; +static char sccsid[] = "@(#)df.c 5.27 (Berkeley) %G%"; #endif /* not lint */ #include @@ -169,9 +169,9 @@ prtstat(sfsp, maxwidth) used = sfsp->f_blocks - sfsp->f_bfree; availblks = sfsp->f_bavail + used; printf(" %8ld%8ld%8ld", - sfsp->f_blocks * sfsp->f_fsize / (kflag ? 1024 : 512), - used * sfsp->f_fsize / (kflag ? 1024 : 512), - sfsp->f_bavail * sfsp->f_fsize / (kflag ? 1024 : 512)); + sfsp->f_blocks * sfsp->f_bsize / (kflag ? 1024 : 512), + used * sfsp->f_bsize / (kflag ? 1024 : 512), + sfsp->f_bavail * sfsp->f_bsize / (kflag ? 1024 : 512)); printf("%6.0f%%", availblks == 0 ? 100.0 : (double)used / (double)availblks * 100.0); if (iflag) { @@ -225,8 +225,8 @@ ufs_df(file, maxwidth) sfsp = &statfsbuf; sfsp->f_type = MOUNT_UFS; sfsp->f_flags = 0; - sfsp->f_fsize = sblock.fs_fsize; - sfsp->f_bsize = sblock.fs_bsize; + sfsp->f_bsize = sblock.fs_fsize; + sfsp->f_iosize = sblock.fs_bsize; sfsp->f_blocks = sblock.fs_dsize; sfsp->f_bfree = sblock.fs_cstotal.cs_nbfree * sblock.fs_frag + sblock.fs_cstotal.cs_nffree; diff --git a/usr/src/sys/dev/vn.c b/usr/src/sys/dev/vn.c index f576544aa0..cbf18c6486 100644 --- a/usr/src/sys/dev/vn.c +++ b/usr/src/sys/dev/vn.c @@ -11,7 +11,7 @@ * * from: Utah $Hdr: vn.c 1.1 91/04/30$ * - * @(#)vn.c 7.6 (Berkeley) %G% + * @(#)vn.c 7.7 (Berkeley) %G% */ /* @@ -136,7 +136,7 @@ vnstrategy(bp) return; } bn = dbtob(bn); - bsize = vn->sc_vp->v_mount->mnt_stat.f_bsize; + bsize = vn->sc_vp->v_mount->mnt_stat.f_iosize; addr = bp->b_un.b_addr; flags = bp->b_flags | B_CALL; for (resid = bp->b_resid; resid; resid -= sz) { diff --git a/usr/src/sys/ufs/ffs/ufs_lookup.c b/usr/src/sys/ufs/ffs/ufs_lookup.c index acfe22d63e..124a0ca411 100644 --- a/usr/src/sys/ufs/ffs/ufs_lookup.c +++ b/usr/src/sys/ufs/ffs/ufs_lookup.c @@ -4,7 +4,7 @@ * * %sccs.include.redist.c% * - * @(#)ufs_lookup.c 7.35 (Berkeley) %G% + * @(#)ufs_lookup.c 7.36 (Berkeley) %G% */ #include @@ -186,7 +186,7 @@ ufs_lookup(vdp, ndp, p) * profiling time and hence has been removed in the interest * of simplicity. */ - bmask = VFSTOUFS(vdp->v_mount)->um_mountp->mnt_stat.f_bsize - 1; + bmask = VFSTOUFS(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1; if (flag != LOOKUP || dp->i_diroff == 0 || dp->i_diroff > dp->i_size) { ndp->ni_ufs.ufs_offset = 0; numdirpasses = 1; @@ -620,7 +620,7 @@ ufs_direnter(ip, ndp) auio.uio_procp = (struct proc *)0; error = VOP_WRITE(dvp, &auio, IO_SYNC, ndp->ni_cred); if (DIRBLKSIZ > - VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_fsize) + VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_bsize) /* XXX should grow with balloc() */ panic("ufs_direnter: frag size"); else if (!error) { diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c index 859110db8f..4adf5f9718 100644 --- a/usr/src/sys/ufs/ffs/ufs_vnops.c +++ b/usr/src/sys/ufs/ffs/ufs_vnops.c @@ -4,7 +4,7 @@ * * %sccs.include.redist.c% * - * @(#)ufs_vnops.c 7.68 (Berkeley) %G% + * @(#)ufs_vnops.c 7.69 (Berkeley) %G% */ #include @@ -234,7 +234,7 @@ ufs_getattr(vp, vap, cred, p) else if (vp->v_type == VCHR) vap->va_blocksize = MAXBSIZE; else - vap->va_blocksize = vp->v_mount->mnt_stat.f_bsize; + vap->va_blocksize = vp->v_mount->mnt_stat.f_iosize; vap->va_bytes = dbtob(ip->i_blocks); vap->va_bytes_rsv = 0; vap->va_type = vp->v_type; @@ -993,7 +993,7 @@ ufs_mkdir(ndp, vap, p) dp->i_flag |= ICHG; goto bad; } - if (DIRBLKSIZ > VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_fsize) + if (DIRBLKSIZ > VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_bsize) panic("ufs_mkdir: blksize"); /* XXX should grow with balloc() */ else { ip->i_size = DIRBLKSIZ; diff --git a/usr/src/sys/ufs/lfs/lfs_vfsops.c b/usr/src/sys/ufs/lfs/lfs_vfsops.c index b867523b0e..707664788b 100644 --- a/usr/src/sys/ufs/lfs/lfs_vfsops.c +++ b/usr/src/sys/ufs/lfs/lfs_vfsops.c @@ -4,7 +4,7 @@ * * %sccs.include.redist.c% * - * @(#)lfs_vfsops.c 7.66 (Berkeley) %G% + * @(#)lfs_vfsops.c 7.67 (Berkeley) %G% */ #include @@ -351,8 +351,8 @@ lfs_statfs(mp, sbp, p) if (fs->lfs_magic != LFS_MAGIC) panic("lfs_statfs: magic"); sbp->f_type = MOUNT_LFS; - sbp->f_fsize = fs->lfs_bsize; sbp->f_bsize = fs->lfs_bsize; + sbp->f_iosize = fs->lfs_bsize; sbp->f_blocks = fs->lfs_dsize; sbp->f_bfree = fs->lfs_bfree; sbp->f_bavail = (fs->lfs_dsize * (100 - fs->lfs_minfree) / 100) - diff --git a/usr/src/sys/ufs/ufs/ufs_lookup.c b/usr/src/sys/ufs/ufs/ufs_lookup.c index acfe22d63e..124a0ca411 100644 --- a/usr/src/sys/ufs/ufs/ufs_lookup.c +++ b/usr/src/sys/ufs/ufs/ufs_lookup.c @@ -4,7 +4,7 @@ * * %sccs.include.redist.c% * - * @(#)ufs_lookup.c 7.35 (Berkeley) %G% + * @(#)ufs_lookup.c 7.36 (Berkeley) %G% */ #include @@ -186,7 +186,7 @@ ufs_lookup(vdp, ndp, p) * profiling time and hence has been removed in the interest * of simplicity. */ - bmask = VFSTOUFS(vdp->v_mount)->um_mountp->mnt_stat.f_bsize - 1; + bmask = VFSTOUFS(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1; if (flag != LOOKUP || dp->i_diroff == 0 || dp->i_diroff > dp->i_size) { ndp->ni_ufs.ufs_offset = 0; numdirpasses = 1; @@ -620,7 +620,7 @@ ufs_direnter(ip, ndp) auio.uio_procp = (struct proc *)0; error = VOP_WRITE(dvp, &auio, IO_SYNC, ndp->ni_cred); if (DIRBLKSIZ > - VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_fsize) + VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_bsize) /* XXX should grow with balloc() */ panic("ufs_direnter: frag size"); else if (!error) { diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c index 859110db8f..4adf5f9718 100644 --- a/usr/src/sys/ufs/ufs/ufs_vnops.c +++ b/usr/src/sys/ufs/ufs/ufs_vnops.c @@ -4,7 +4,7 @@ * * %sccs.include.redist.c% * - * @(#)ufs_vnops.c 7.68 (Berkeley) %G% + * @(#)ufs_vnops.c 7.69 (Berkeley) %G% */ #include @@ -234,7 +234,7 @@ ufs_getattr(vp, vap, cred, p) else if (vp->v_type == VCHR) vap->va_blocksize = MAXBSIZE; else - vap->va_blocksize = vp->v_mount->mnt_stat.f_bsize; + vap->va_blocksize = vp->v_mount->mnt_stat.f_iosize; vap->va_bytes = dbtob(ip->i_blocks); vap->va_bytes_rsv = 0; vap->va_type = vp->v_type; @@ -993,7 +993,7 @@ ufs_mkdir(ndp, vap, p) dp->i_flag |= ICHG; goto bad; } - if (DIRBLKSIZ > VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_fsize) + if (DIRBLKSIZ > VFSTOUFS(dvp->v_mount)->um_mountp->mnt_stat.f_bsize) panic("ufs_mkdir: blksize"); /* XXX should grow with balloc() */ else { ip->i_size = DIRBLKSIZ; -- 2.20.1