cg_link => cg_firstfield; fs_link => fs_firstfield

SCCS-vsn: sbin/fsck/setup.c 8.4
SCCS-vsn: sbin/fsck/pass5.c 8.3

diff --git a/usr/src/sbin/fsck/pass5.c b/usr/src/sbin/fsck/pass5.c
index adb2880..7eccda7 100644 (file)
--- a/usr/src/sbin/fsck/pass5.c
+++ b/usr/src/sbin/fsck/pass5.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pass5.c    8.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass5.c    8.3 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -75,8 +75,9 @@ pass5()
        switch ((int)fs->fs_postblformat) {
 
        case FS_42POSTBLFMT:
        switch ((int)fs->fs_postblformat) {
 
        case FS_42POSTBLFMT:

-               basesize = (char *)(&ocg->cg_btot[0]) - (char *)(&ocg->cg_link);
-               sumsize = &ocg->cg_iused[0] - (char *)(&ocg->cg_btot[0]);
+               basesize = (char *)(&ocg->cg_btot[0]) -
+                   (char *)(&ocg->cg_firstfield);
+               sumsize = &ocg->cg_iused[0] - (u_int8_t *)(&ocg->cg_btot[0]);

                mapsize = &ocg->cg_free[howmany(fs->fs_fpg, NBBY)] -
                        (u_char *)&ocg->cg_iused[0];
                ocg->cg_magic = CG_MAGIC;
                mapsize = &ocg->cg_free[howmany(fs->fs_fpg, NBBY)] -
                        (u_char *)&ocg->cg_iused[0];
                ocg->cg_magic = CG_MAGIC;


@@ -86,7 +87,7 @@ pass5()
 
        case FS_DYNAMICPOSTBLFMT:
                newcg->cg_btotoff =
 
        case FS_DYNAMICPOSTBLFMT:
                newcg->cg_btotoff =

-                    &newcg->cg_space[0] - (u_char *)(&newcg->cg_link);
+                    &newcg->cg_space[0] - (u_char *)(&newcg->cg_firstfield);

                newcg->cg_boff =
                    newcg->cg_btotoff + fs->fs_cpg * sizeof(long);
                newcg->cg_iusedoff = newcg->cg_boff + 
                newcg->cg_boff =
                    newcg->cg_btotoff + fs->fs_cpg * sizeof(long);
                newcg->cg_iusedoff = newcg->cg_boff + 


@@ -108,7 +109,8 @@ pass5()
                            howmany(fs->fs_cpg * fs->fs_spc / NSPB(fs), NBBY);
                }
                newcg->cg_magic = CG_MAGIC;
                            howmany(fs->fs_cpg * fs->fs_spc / NSPB(fs), NBBY);
                }
                newcg->cg_magic = CG_MAGIC;

-               basesize = &newcg->cg_space[0] - (u_char *)(&newcg->cg_link);
+               basesize = &newcg->cg_space[0] -
+                   (u_char *)(&newcg->cg_firstfield);

                sumsize = newcg->cg_iusedoff - newcg->cg_btotoff;
                mapsize = newcg->cg_nextfreeoff - newcg->cg_iusedoff;
                break;
                sumsize = newcg->cg_iusedoff - newcg->cg_btotoff;
                mapsize = newcg->cg_nextfreeoff - newcg->cg_iusedoff;
                break;

diff --git a/usr/src/sbin/fsck/setup.c b/usr/src/sbin/fsck/setup.c
index 6829b5d..fa6899f 100644 (file)
--- a/usr/src/sbin/fsck/setup.c
+++ b/usr/src/sbin/fsck/setup.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)setup.c    8.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)setup.c    8.4 (Berkeley) %G%";

 #endif /* not lint */
 
 #define DKTYPENAMES
 #endif /* not lint */
 
 #define DKTYPENAMES


@@ -180,9 +180,9 @@ setup(dev)
                sblock.fs_nrpos = 8;
                sblock.fs_postbloff =
                    (char *)(&sblock.fs_opostbl[0][0]) -
                sblock.fs_nrpos = 8;
                sblock.fs_postbloff =
                    (char *)(&sblock.fs_opostbl[0][0]) -

-                   (char *)(&sblock.fs_link);
+                   (char *)(&sblock.fs_firstfield);

                sblock.fs_rotbloff = &sblock.fs_space[0] -
                sblock.fs_rotbloff = &sblock.fs_space[0] -

-                   (u_char *)(&sblock.fs_link);
+                   (u_char *)(&sblock.fs_firstfield);

                sblock.fs_cgsize =
                        fragroundup(&sblock, CGSIZE(&sblock));
                sbdirty();
                sblock.fs_cgsize =
                        fragroundup(&sblock, CGSIZE(&sblock));
                sbdirty();


@@ -304,8 +304,6 @@ readsb(listerr)
        getblk(&asblk, cgsblock(&sblock, sblock.fs_ncg - 1), sblock.fs_sbsize);
        if (asblk.b_errs)
                return (0);
        getblk(&asblk, cgsblock(&sblock, sblock.fs_ncg - 1), sblock.fs_sbsize);
        if (asblk.b_errs)
                return (0);

-       altsblock.fs_link = sblock.fs_link;
-       altsblock.fs_rlink = sblock.fs_rlink;

        altsblock.fs_time = sblock.fs_time;
        altsblock.fs_cstotal = sblock.fs_cstotal;
        altsblock.fs_cgrotor = sblock.fs_cgrotor;
        altsblock.fs_time = sblock.fs_time;
        altsblock.fs_cstotal = sblock.fs_cstotal;
        altsblock.fs_cgrotor = sblock.fs_cgrotor;