statfs.f_bsize => statfs.f_iosize; statfs.f_fsize => statfs.f_bsize (for SunOS)

[unix-history] / usr / src / sys / ufs / ffs / ufs_vnops.c

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index e86b848..4adf5f9 100644 (file)
--- 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%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.67 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.69 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -234,7 +234,7 @@ ufs_getattr(vp, vap, cred, p)
        else if (vp->v_type == VCHR)
                vap->va_blocksize = MAXBSIZE;
        else
        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;
        vap->va_bytes = dbtob(ip->i_blocks);
        vap->va_bytes_rsv = 0;
        vap->va_type = vp->v_type;


@@ -310,7 +310,7 @@ ufs_setattr(vp, vap, cred, p)
  * Change the mode on a file.
  * Inode must be locked before calling.
  */
  * Change the mode on a file.
  * Inode must be locked before calling.
  */

-int
+static int

 ufs_chmod(vp, mode, p)
        register struct vnode *vp;
        register int mode;
 ufs_chmod(vp, mode, p)
        register struct vnode *vp;
        register int mode;


@@ -341,7 +341,7 @@ ufs_chmod(vp, mode, p)
  * Perform chown operation on inode ip;
  * inode must be locked prior to call.
  */
  * Perform chown operation on inode ip;
  * inode must be locked prior to call.
  */

-int
+static int

 ufs_chown(vp, uid, gid, p)
        register struct vnode *vp;
        u_int uid;
 ufs_chown(vp, uid, gid, p)
        register struct vnode *vp;
        u_int uid;


@@ -993,7 +993,7 @@ ufs_mkdir(ndp, vap, p)
                dp->i_flag |= ICHG;
                goto bad;
        }
                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;
                panic("ufs_mkdir: blksize"); /* XXX should grow with balloc() */
        else {
                ip->i_size = DIRBLKSIZ;