do not have to have alternate superblock if -b is specified

[unix-history] / usr / src / sbin / fsck / fsck.h

diff --git a/usr/src/sbin/fsck/fsck.h b/usr/src/sbin/fsck/fsck.h
index d1a3081..dd51f43 100644 (file)
--- a/usr/src/sbin/fsck/fsck.h
+++ b/usr/src/sbin/fsck/fsck.h
@@ -1,14 +1,16 @@
 /*
 /*

- * 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.

  *
  *

- *     @(#)fsck.h      5.9 (Berkeley) %G%
+ * %sccs.include.redist.c%
+ *
+ *     @(#)fsck.h      5.18 (Berkeley) %G%

  */
 
  */
 

-#define        MAXDUP          10       /* limit on dup blks (per inode) */
-#define        MAXBAD          10       /* limit on bad blks (per inode) */
-#define MAXBUFSPACE    128*1024 /* maximum space to allocate to buffers */
+#define        MAXDUP          10      /* limit on dup blks (per inode) */
+#define        MAXBAD          10      /* limit on bad blks (per inode) */
+#define        MAXBUFSPACE     40*1024 /* maximum space to allocate to buffers */
+#define        INOBUFSIZE      56*1024 /* size of buffer to read inodes in pass1 */

 
 #ifndef BUFSIZ
 #define BUFSIZ 1024
 
 #ifndef BUFSIZ
 #define BUFSIZ 1024


@@ -47,6 +49,8 @@ struct bufarea {
 struct bufarea bufhead;                /* head of list of other blks in filesys */
 struct bufarea sblk;           /* file system superblock */
 struct bufarea cgblk;          /* cylinder group blocks */
 struct bufarea bufhead;                /* head of list of other blks in filesys */
 struct bufarea sblk;           /* file system superblock */
 struct bufarea cgblk;          /* cylinder group blocks */

+struct bufarea *pdirbp;                /* current directory contents */
+struct bufarea *pbp;           /* current inode block */

 struct bufarea *getdatablk();
 
 #define        dirty(bp)       (bp)->b_dirty = 1
 struct bufarea *getdatablk();
 
 #define        dirty(bp)       (bp)->b_dirty = 1


@@ -60,7 +64,7 @@ struct bufarea *getdatablk();
 #define        sblock          (*sblk.b_un.b_fs)
 #define        cgrp            (*cgblk.b_un.b_cg)
 
 #define        sblock          (*sblk.b_un.b_fs)
 #define        cgrp            (*cgblk.b_un.b_cg)
 

-enum fixstate {DONTKNOW, NOFIX, FIX};
+enum fixstate {DONTKNOW, NOFIX, FIX, IGNORE};

 
 struct inodesc {
        enum fixstate id_fix;   /* policy on fixing errors */
 
 struct inodesc {
        enum fixstate id_fix;   /* policy on fixing errors */


@@ -69,7 +73,7 @@ struct inodesc {
        ino_t id_parent;        /* for DATA nodes, their parent */
        daddr_t id_blkno;       /* current block number being examined */
        int id_numfrags;        /* number of frags contained in block */
        ino_t id_parent;        /* for DATA nodes, their parent */
        daddr_t id_blkno;       /* current block number being examined */
        int id_numfrags;        /* number of frags contained in block */

-       long id_filesize;       /* for DATA nodes, the size of the directory */
+       quad_t id_filesize;     /* for DATA nodes, the size of the directory */

        int id_loc;             /* for DATA nodes, current location in dir */
        int id_entryno;         /* for DATA nodes, current entry number */
        struct direct *id_dirp; /* for DATA nodes, ptr to current entry */
        int id_loc;             /* for DATA nodes, current location in dir */
        int id_entryno;         /* for DATA nodes, current entry number */
        struct direct *id_dirp; /* for DATA nodes, ptr to current entry */


@@ -117,6 +121,20 @@ struct zlncnt {
 };
 struct zlncnt *zlnhead;                /* head of zero link count list */
 
 };
 struct zlncnt *zlnhead;                /* head of zero link count list */
 

+/*
+ * Inode cache data structures.
+ */
+struct inoinfo {
+       struct  inoinfo *i_nexthash;    /* next entry in hash chain */
+       ino_t   i_number;               /* inode number of this entry */
+       ino_t   i_parent;               /* inode number of parent */
+       ino_t   i_dotdot;               /* inode number of `..' */
+       size_t  i_isize;                /* size of inode */
+       u_int   i_numblks;              /* size of block array in bytes */
+       daddr_t i_blks[1];              /* actually longer */
+} **inphead, **inpsort;
+long numdirs, listmax, inplast;
+

 char   *devname;               /* name of device being checked */
 long   dev_bsize;              /* computed value of DEV_BSIZE */
 long   secsize;                /* actual disk sector size */
 char   *devname;               /* name of device being checked */
 long   dev_bsize;              /* computed value of DEV_BSIZE */
 long   secsize;                /* actual disk sector size */


@@ -139,10 +157,6 @@ ino_t      lastino;                /* last inode in use */
 char   *statemap;              /* ptr to inode state table */
 short  *lncntp;                /* ptr to link count table */
 
 char   *statemap;              /* ptr to inode state table */
 short  *lncntp;                /* ptr to link count table */
 

-char   pathname[BUFSIZ];       /* current pathname */
-char   *pathp;                 /* ptr to current position in pathname */
-char   *endpathname;           /* ptr to current end of pathname */
-

 ino_t  lfdir;                  /* lost & found directory inode number */
 char   *lfname;                /* lost & found directory name */
 int    lfmode;                 /* lost & found directory creation mode */
 ino_t  lfdir;                  /* lost & found directory inode number */
 char   *lfname;                /* lost & found directory name */
 int    lfmode;                 /* lost & found directory creation mode */


@@ -165,6 +179,7 @@ struct      dinode zino;
 
 time_t time();
 struct dinode *ginode();
 
 time_t time();
 struct dinode *ginode();

-struct bufarea *getblk();
+struct inoinfo *getinoinfo();
+void getblk();

 ino_t allocino();
 int findino();
 ino_t allocino();
 int findino();