update for quad support

SCCS-vsn: sbin/newfs/mkfs.c 6.20

diff --git a/usr/src/sbin/newfs/mkfs.c b/usr/src/sbin/newfs/mkfs.c
index ef5113e..3f3a503 100644 (file)
--- a/usr/src/sbin/newfs/mkfs.c
+++ b/usr/src/sbin/newfs/mkfs.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)mkfs.c     6.19 (Berkeley) %G%";
+static char sccsid[] = "@(#)mkfs.c     6.20 (Berkeley) %G%";

 #endif /* not lint */
 
 #ifndef STANDALONE
 #endif /* not lint */
 
 #ifndef STANDALONE


@@ -193,18 +193,15 @@ mkfs(pp, fsys, fi, fo)
        /*
         * Planning now for future expansion.
         */
        /*
         * Planning now for future expansion.
         */

-#      if (BYTE_ORDER == BIG_ENDIAN)
-               sblock.fs_qbmask.val[0] = 0;
-               sblock.fs_qbmask.val[1] = ~sblock.fs_bmask;
-               sblock.fs_qfmask.val[0] = 0;
-               sblock.fs_qfmask.val[1] = ~sblock.fs_fmask;
-#      endif /* BIG_ENDIAN */
-#      if (BYTE_ORDER == LITTLE_ENDIAN)
-               sblock.fs_qbmask.val[0] = ~sblock.fs_bmask;
-               sblock.fs_qbmask.val[1] = 0;
-               sblock.fs_qfmask.val[0] = ~sblock.fs_fmask;
-               sblock.fs_qfmask.val[1] = 0;
-#      endif /* LITTLE_ENDIAN */
+#      ifdef _NOQUAD
+               sblock.fs_qbmask.val[_QUAD_HIGHWORD] = 0;
+               sblock.fs_qbmask.val[_QUAD_LOWWORD] = ~sblock.fs_bmask;
+               sblock.fs_qfmask.val[_QUAD_HIGHWORD] = 0;
+               sblock.fs_qfmask.val[_QUAD_LOWWORD] = ~sblock.fs_fmask;
+#      else /* QUAD */
+               sblock.fs_qbmask = ~sblock.fs_bmask;
+               sblock.fs_qfmask = ~sblock.fs_fmask;
+#      endif /* QUAD */

        for (sblock.fs_bshift = 0, i = sblock.fs_bsize; i > 1; i >>= 1)
                sblock.fs_bshift++;
        for (sblock.fs_fshift = 0, i = sblock.fs_fsize; i > 1; i >>= 1)
        for (sblock.fs_bshift = 0, i = sblock.fs_bsize; i > 1; i >>= 1)
                sblock.fs_bshift++;
        for (sblock.fs_fshift = 0, i = sblock.fs_fsize; i > 1; i >>= 1)