salvage the correct part of the directory

[unix-history] / usr / src / sbin / fsck / pass5.c

diff --git a/usr/src/sbin/fsck/pass5.c b/usr/src/sbin/fsck/pass5.c
index 0e5bf4e..7d41ed6 100644 (file)
--- a/usr/src/sbin/fsck/pass5.c
+++ b/usr/src/sbin/fsck/pass5.c
@@ -1,16 +1,19 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980, 1986 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pass5.c    5.5 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)pass5.c    5.18 (Berkeley) %G%";
+#endif /* not lint */

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

-#include <sys/inode.h>
-#include <sys/fs.h>
+#include <sys/time.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ffs/fs.h>
+#include <string.h>

 #include "fsck.h"
 
 pass5()
 #include "fsck.h"
 
 pass5()


@@ -22,16 +25,15 @@ pass5()
        register daddr_t d;
        register long i, j;
        struct csum *cs;
        register daddr_t d;
        register long i, j;
        struct csum *cs;

-       time_t now;

        struct csum cstotal;
        struct csum cstotal;

-       struct inodesc idesc;
+       struct inodesc idesc[3];

        char buf[MAXBSIZE];
        register struct cg *newcg = (struct cg *)buf;
        struct ocg *ocg = (struct ocg *)buf;
 
        char buf[MAXBSIZE];
        register struct cg *newcg = (struct cg *)buf;
        struct ocg *ocg = (struct ocg *)buf;
 

-       bzero((char *)newcg, fs->fs_cgsize);
+       bzero((char *)newcg, (size_t)fs->fs_cgsize);

        newcg->cg_niblk = fs->fs_ipg;
        newcg->cg_niblk = fs->fs_ipg;

-       switch (fs->fs_postblformat) {
+       switch ((int)fs->fs_postblformat) {

 
        case FS_42POSTBLFMT:
                basesize = (char *)(&ocg->cg_btot[0]) - (char *)(&ocg->cg_link);
 
        case FS_42POSTBLFMT:
                basesize = (char *)(&ocg->cg_btot[0]) - (char *)(&ocg->cg_link);


@@ -65,11 +67,15 @@ pass5()
                errexit("UNKNOWN ROTATIONAL TABLE FORMAT %d\n",
                        fs->fs_postblformat);
        }
                errexit("UNKNOWN ROTATIONAL TABLE FORMAT %d\n",
                        fs->fs_postblformat);
        }

-       bzero((char *)&idesc, sizeof(struct inodesc));
-       idesc.id_type = ADDR;
+       bzero((char *)&idesc[0], sizeof idesc);
+       for (i = 0; i < 3; i++) {
+               idesc[i].id_type = ADDR;
+               if (doinglevel2)
+                       idesc[i].id_fix = FIX;
+       }

        bzero((char *)&cstotal, sizeof(struct csum));
        bzero((char *)&cstotal, sizeof(struct csum));

-       (void)time(&now);
-       for (i = fs->fs_size; i < fragroundup(fs, fs->fs_size); i++)
+       j = blknum(fs, fs->fs_size + fs->fs_frag - 1);
+       for (i = fs->fs_size; i < j; i++)

                setbmap(i);
        for (c = 0; c < fs->fs_ncg; c++) {
                getblk(&cgblk, cgtod(fs, c), fs->fs_cgsize);
                setbmap(i);
        for (c = 0; c < fs->fs_ncg; c++) {
                getblk(&cgblk, cgtod(fs, c), fs->fs_cgsize);


@@ -79,10 +85,7 @@ pass5()
                dmax = dbase + fs->fs_fpg;
                if (dmax > fs->fs_size)
                        dmax = fs->fs_size;
                dmax = dbase + fs->fs_fpg;
                if (dmax > fs->fs_size)
                        dmax = fs->fs_size;

-               if (now > cg->cg_time)
-                       newcg->cg_time = cg->cg_time;
-               else
-                       newcg->cg_time = now;
+               newcg->cg_time = cg->cg_time;

                newcg->cg_cgx = c;
                if (c == fs->fs_ncg - 1)
                        newcg->cg_ncyl = fs->fs_ncyl % fs->fs_cpg;
                newcg->cg_cgx = c;
                if (c == fs->fs_ncg - 1)
                        newcg->cg_ncyl = fs->fs_ncyl % fs->fs_cpg;


@@ -106,7 +109,8 @@ pass5()
                else
                        newcg->cg_irotor = 0;
                bzero((char *)&newcg->cg_frsum[0], sizeof newcg->cg_frsum);
                else
                        newcg->cg_irotor = 0;
                bzero((char *)&newcg->cg_frsum[0], sizeof newcg->cg_frsum);

-               bzero((char *)&cg_blktot(newcg)[0], sumsize + mapsize);
+               bzero((char *)&cg_blktot(newcg)[0],
+                     (size_t)(sumsize + mapsize));

                if (fs->fs_postblformat == FS_42POSTBLFMT)
                        ocg->cg_magic = CG_MAGIC;
                j = fs->fs_ipg * c;
                if (fs->fs_postblformat == FS_42POSTBLFMT)
                        ocg->cg_magic = CG_MAGIC;
                j = fs->fs_ipg * c;


@@ -145,7 +149,7 @@ pass5()
                     d += fs->fs_frag, i += fs->fs_frag) {
                        frags = 0;
                        for (j = 0; j < fs->fs_frag; j++) {
                     d += fs->fs_frag, i += fs->fs_frag) {
                        frags = 0;
                        for (j = 0; j < fs->fs_frag; j++) {

-                               if (getbmap(d + j))
+                               if (testbmap(d + j))

                                        continue;
                                setbit(cg_blksfree(newcg), i + j);
                                frags++;
                                        continue;
                                setbit(cg_blksfree(newcg), i + j);
                                frags++;


@@ -158,7 +162,7 @@ pass5()
                        } else if (frags > 0) {
                                newcg->cg_cs.cs_nffree += frags;
                                blk = blkmap(fs, cg_blksfree(newcg), i);
                        } else if (frags > 0) {
                                newcg->cg_cs.cs_nffree += frags;
                                blk = blkmap(fs, cg_blksfree(newcg), i);

-                               fragacct(fs, blk, newcg->cg_frsum, 1);
+                               ffs_fragacct(fs, blk, newcg->cg_frsum, 1);

                        }
                }
                cstotal.cs_nffree += newcg->cg_cs.cs_nffree;
                        }
                }
                cstotal.cs_nffree += newcg->cg_cs.cs_nffree;


@@ -167,35 +171,36 @@ pass5()
                cstotal.cs_ndir += newcg->cg_cs.cs_ndir;
                cs = &fs->fs_cs(fs, c);
                if (bcmp((char *)&newcg->cg_cs, (char *)cs, sizeof *cs) != 0 &&
                cstotal.cs_ndir += newcg->cg_cs.cs_ndir;
                cs = &fs->fs_cs(fs, c);
                if (bcmp((char *)&newcg->cg_cs, (char *)cs, sizeof *cs) != 0 &&

-                   dofix(&idesc, "FREE BLK COUNT(S) WRONG IN SUPERBLK")) {
+                   dofix(&idesc[0], "FREE BLK COUNT(S) WRONG IN SUPERBLK")) {

                        bcopy((char *)&newcg->cg_cs, (char *)cs, sizeof *cs);
                        sbdirty();
                }
                        bcopy((char *)&newcg->cg_cs, (char *)cs, sizeof *cs);
                        sbdirty();
                }

-               if (cvtflag) {
-                       bcopy((char *)newcg, (char *)cg, fs->fs_cgsize);
+               if (doinglevel1) {
+                       bcopy((char *)newcg, (char *)cg, (size_t)fs->fs_cgsize);

                        cgdirty();
                        continue;
                }
                if (bcmp(cg_inosused(newcg),
                         cg_inosused(cg), mapsize) != 0 &&
                        cgdirty();
                        continue;
                }
                if (bcmp(cg_inosused(newcg),
                         cg_inosused(cg), mapsize) != 0 &&

-                   dofix(&idesc, "BLK(S) MISSING IN BIT MAPS")) {
-                       bcopy(cg_inosused(newcg), cg_inosused(cg), mapsize);
+                   dofix(&idesc[1], "BLK(S) MISSING IN BIT MAPS")) {
+                       bcopy(cg_inosused(newcg), cg_inosused(cg),
+                             (size_t)mapsize);

                        cgdirty();
                }
                if ((bcmp((char *)newcg, (char *)cg, basesize) != 0 ||
                     bcmp((char *)&cg_blktot(newcg)[0],
                          (char *)&cg_blktot(cg)[0], sumsize) != 0) &&
                        cgdirty();
                }
                if ((bcmp((char *)newcg, (char *)cg, basesize) != 0 ||
                     bcmp((char *)&cg_blktot(newcg)[0],
                          (char *)&cg_blktot(cg)[0], sumsize) != 0) &&

-                   dofix(&idesc, "SUMMARY INFORMATION BAD")) {
-                       bcopy((char *)newcg, (char *)cg, basesize);
+                   dofix(&idesc[2], "SUMMARY INFORMATION BAD")) {
+                       bcopy((char *)newcg, (char *)cg, (size_t)basesize);

                        bcopy((char *)&cg_blktot(newcg)[0],
                        bcopy((char *)&cg_blktot(newcg)[0],

-                             (char *)&cg_blktot(cg)[0], sumsize);
+                             (char *)&cg_blktot(cg)[0], (size_t)sumsize);

                        cgdirty();
                }
        }
        if (fs->fs_postblformat == FS_42POSTBLFMT)
                fs->fs_nrpos = savednrpos;
        if (bcmp((char *)&cstotal, (char *)&fs->fs_cstotal, sizeof *cs) != 0
                        cgdirty();
                }
        }
        if (fs->fs_postblformat == FS_42POSTBLFMT)
                fs->fs_nrpos = savednrpos;
        if (bcmp((char *)&cstotal, (char *)&fs->fs_cstotal, sizeof *cs) != 0

-           && dofix(&idesc, "FREE BLK COUNT(S) WRONG IN SUPERBLK")) {
+           && dofix(&idesc[0], "FREE BLK COUNT(S) WRONG IN SUPERBLK")) {

                bcopy((char *)&cstotal, (char *)&fs->fs_cstotal, sizeof *cs);
                fs->fs_ronly = 0;
                fs->fs_fmod = 0;
                bcopy((char *)&cstotal, (char *)&fs->fs_cstotal, sizeof *cs);
                fs->fs_ronly = 0;
                fs->fs_fmod = 0;