macroize cylinder group array references to allow dynamic tables

[unix-history] / usr / src / sys / ufs / lfs / lfs_alloc.c

diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c
index 689a7cf..04ca4b1 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -1,16 +1,23 @@
-/*     lfs_alloc.c     6.6     84/09/28        */
+/*
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)lfs_alloc.c 7.5 (Berkeley) %G%
+ */

 
 #include "param.h"
 #include "systm.h"
 #include "mount.h"
 #include "fs.h"
 
 #include "param.h"
 #include "systm.h"
 #include "mount.h"
 #include "fs.h"

-#include "conf.h"

 #include "buf.h"
 #include "inode.h"
 #include "dir.h"
 #include "user.h"
 #include "quota.h"
 #include "kernel.h"
 #include "buf.h"
 #include "inode.h"
 #include "dir.h"
 #include "user.h"
 #include "quota.h"
 #include "kernel.h"

+#include "syslog.h"
+#include "cmap.h"

 
 extern u_long          hashalloc();
 extern ino_t           ialloccg();
 
 extern u_long          hashalloc();
 extern ino_t           ialloccg();


@@ -79,7 +86,11 @@ alloc(ip, bpref, size)
                goto nospace;
        ip->i_blocks += btodb(size);
        ip->i_flag |= IUPD|ICHG;
                goto nospace;
        ip->i_blocks += btodb(size);
        ip->i_flag |= IUPD|ICHG;

+#ifdef SECSIZE
+       bp = getblk(ip->i_dev, fsbtodb(fs, bno), size, fs->fs_dbsize);
+#else SECSIZE

        bp = getblk(ip->i_dev, fsbtodb(fs, bno), size);
        bp = getblk(ip->i_dev, fsbtodb(fs, bno), size);

+#endif SECSIZE

        clrbuf(bp);
        return (bp);
 nospace:
        clrbuf(bp);
        return (bp);
 nospace:


@@ -103,10 +114,11 @@ realloccg(ip, bprev, bpref, osize, nsize)
        daddr_t bprev, bpref;
        int osize, nsize;
 {
        daddr_t bprev, bpref;
        int osize, nsize;
 {

-       daddr_t bno;

        register struct fs *fs;
        register struct buf *bp, *obp;
        register struct fs *fs;
        register struct buf *bp, *obp;

-       int cg;
+       int cg, request;
+       daddr_t bno, bn;
+       int i, count;

        
        fs = ip->i_fs;
        if ((unsigned)osize > fs->fs_bsize || fragoff(fs, osize) != 0 ||
        
        fs = ip->i_fs;
        if ((unsigned)osize > fs->fs_bsize || fragoff(fs, osize) != 0 ||


@@ -131,7 +143,12 @@ realloccg(ip, bprev, bpref, osize, nsize)
        bno = fragextend(ip, cg, (long)bprev, osize, nsize);
        if (bno != 0) {
                do {
        bno = fragextend(ip, cg, (long)bprev, osize, nsize);
        if (bno != 0) {
                do {

+#ifdef SECSIZE
+                       bp = bread(ip->i_dev, fsbtodb(fs, bno), osize,
+                           fs->fs_dbsize);
+#else SECSIZE

                        bp = bread(ip->i_dev, fsbtodb(fs, bno), osize);
                        bp = bread(ip->i_dev, fsbtodb(fs, bno), osize);

+#endif SECSIZE

                        if (bp->b_flags & B_ERROR) {
                                brelse(bp);
                                return (NULL);
                        if (bp->b_flags & B_ERROR) {
                                brelse(bp);
                                return (NULL);


@@ -145,19 +162,86 @@ realloccg(ip, bprev, bpref, osize, nsize)
        }
        if (bpref >= fs->fs_size)
                bpref = 0;
        }
        if (bpref >= fs->fs_size)
                bpref = 0;

-       bno = (daddr_t)hashalloc(ip, cg, (long)bpref, nsize,
+       switch ((int)fs->fs_optim) {
+       case FS_OPTSPACE:
+               /*
+                * Allocate an exact sized fragment. Although this makes 
+                * best use of space, we will waste time relocating it if 
+                * the file continues to grow. If the fragmentation is
+                * less than half of the minimum free reserve, we choose
+                * to begin optimizing for time.
+                */
+               request = nsize;
+               if (fs->fs_minfree < 5 ||
+                   fs->fs_cstotal.cs_nffree >
+                   fs->fs_dsize * fs->fs_minfree / (2 * 100))
+                       break;
+               log(LOG_NOTICE, "%s: optimization changed from SPACE to TIME\n",
+                       fs->fs_fsmnt);
+               fs->fs_optim = FS_OPTTIME;
+               break;
+       case FS_OPTTIME:
+               /*
+                * At this point we have discovered a file that is trying
+                * to grow a small fragment to a larger fragment. To save
+                * time, we allocate a full sized block, then free the 
+                * unused portion. If the file continues to grow, the 
+                * `fragextend' call above will be able to grow it in place
+                * without further copying. If aberrant programs cause
+                * disk fragmentation to grow within 2% of the free reserve,
+                * we choose to begin optimizing for space.
+                */
+               request = fs->fs_bsize;
+               if (fs->fs_cstotal.cs_nffree <
+                   fs->fs_dsize * (fs->fs_minfree - 2) / 100)
+                       break;
+               log(LOG_NOTICE, "%s: optimization changed from TIME to SPACE\n",
+                       fs->fs_fsmnt);
+               fs->fs_optim = FS_OPTSPACE;
+               break;
+       default:
+               printf("dev = 0x%x, optim = %d, fs = %s\n",
+                   ip->i_dev, fs->fs_optim, fs->fs_fsmnt);
+               panic("realloccg: bad optim");
+               /* NOTREACHED */
+       }
+       bno = (daddr_t)hashalloc(ip, cg, (long)bpref, request,

                (u_long (*)())alloccg);
        if (bno > 0) {
                (u_long (*)())alloccg);
        if (bno > 0) {

+#ifdef SECSIZE
+               obp = bread(ip->i_dev, fsbtodb(fs, bprev), osize,
+                   fs->fs_dbsize);
+#else SECSIZE

                obp = bread(ip->i_dev, fsbtodb(fs, bprev), osize);
                obp = bread(ip->i_dev, fsbtodb(fs, bprev), osize);

+#endif SECSIZE

                if (obp->b_flags & B_ERROR) {
                        brelse(obp);
                        return (NULL);
                }
                if (obp->b_flags & B_ERROR) {
                        brelse(obp);
                        return (NULL);
                }

-               bp = getblk(ip->i_dev, fsbtodb(fs, bno), nsize);
+               bn = fsbtodb(fs, bno);
+#ifdef SECSIZE
+               bp = getblk(ip->i_dev, bn, nsize, fs->fs_dbsize);
+#else SECSIZE
+               bp = getblk(ip->i_dev, bn, nsize);
+#endif SECSIZE

                bcopy(obp->b_un.b_addr, bp->b_un.b_addr, (u_int)osize);
                bcopy(obp->b_un.b_addr, bp->b_un.b_addr, (u_int)osize);

+               count = howmany(osize, CLBYTES);
+               for (i = 0; i < count; i++)
+#ifdef SECSIZE
+                       munhash(ip->i_dev, bn + i * CLBYTES / fs->fs_dbsize);
+#else SECSIZE
+                       munhash(ip->i_dev, bn + i * CLBYTES / DEV_BSIZE);
+#endif SECSIZE

                bzero(bp->b_un.b_addr + osize, (unsigned)nsize - osize);
                bzero(bp->b_un.b_addr + osize, (unsigned)nsize - osize);

+               if (obp->b_flags & B_DELWRI) {
+                       obp->b_flags &= ~B_DELWRI;
+                       u.u_ru.ru_oublock--;            /* delete charge */
+               }

                brelse(obp);
                brelse(obp);

-               free(ip, bprev, (off_t)osize);
+               blkfree(ip, bprev, (off_t)osize);
+               if (nsize < request)
+                       blkfree(ip, bno + numfrags(fs, nsize),
+                               (off_t)(request - nsize));

                ip->i_blocks += btodb(nsize - osize);
                ip->i_flag |= IUPD|ICHG;
                return (bp);
                ip->i_blocks += btodb(nsize - osize);
                ip->i_flag |= IUPD|ICHG;
                return (bp);


@@ -270,9 +354,14 @@ dirpref(fs)
  * the file. If no blocks have been allocated in any other section, the
  * policy is to place the section in a cylinder group with a greater than
  * average number of free blocks.  An appropriate cylinder group is found
  * the file. If no blocks have been allocated in any other section, the
  * policy is to place the section in a cylinder group with a greater than
  * average number of free blocks.  An appropriate cylinder group is found

- * by maintaining a rotor that sweeps the cylinder groups. When a new
- * group of blocks is needed, the rotor is advanced until a cylinder group
- * with greater than the average number of free blocks is found.
+ * by using a rotor that sweeps the cylinder groups. When a new group of
+ * blocks is needed, the sweep begins in the cylinder group following the
+ * cylinder group from which the previous allocation was made. The sweep
+ * continues until a cylinder group with greater than the average number
+ * of free blocks is found. If the allocation is for the first block in an
+ * indirect block, the information on the previous allocation is unavailable;
+ * here a best guess is made based upon the logical block number being
+ * allocated.

  * 
  * If a section is already partially allocated, the policy is to
  * contiguously allocate fs_maxcontig blocks.  The end of one of these
  * 
  * If a section is already partially allocated, the policy is to
  * contiguously allocate fs_maxcontig blocks.  The end of one of these


@@ -289,7 +378,8 @@ blkpref(ip, lbn, indx, bap)
        daddr_t *bap;
 {
        register struct fs *fs;
        daddr_t *bap;
 {
        register struct fs *fs;

-       int cg, avgbfree;
+       register int cg;
+       int avgbfree, startcg;

        daddr_t nextblk;
 
        fs = ip->i_fs;
        daddr_t nextblk;
 
        fs = ip->i_fs;


@@ -302,13 +392,18 @@ blkpref(ip, lbn, indx, bap)
                 * Find a cylinder with greater than average number of
                 * unused data blocks.
                 */
                 * Find a cylinder with greater than average number of
                 * unused data blocks.
                 */

+               if (indx == 0 || bap[indx - 1] == 0)
+                       startcg = itog(fs, ip->i_number) + lbn / fs->fs_maxbpg;
+               else
+                       startcg = dtog(fs, bap[indx - 1]) + 1;
+               startcg %= fs->fs_ncg;

                avgbfree = fs->fs_cstotal.cs_nbfree / fs->fs_ncg;
                avgbfree = fs->fs_cstotal.cs_nbfree / fs->fs_ncg;

-               for (cg = fs->fs_cgrotor + 1; cg < fs->fs_ncg; cg++)
+               for (cg = startcg; cg < fs->fs_ncg; cg++)

                        if (fs->fs_cs(fs, cg).cs_nbfree >= avgbfree) {
                                fs->fs_cgrotor = cg;
                                return (fs->fs_fpg * cg + fs->fs_frag);
                        }
                        if (fs->fs_cs(fs, cg).cs_nbfree >= avgbfree) {
                                fs->fs_cgrotor = cg;
                                return (fs->fs_fpg * cg + fs->fs_frag);
                        }

-               for (cg = 0; cg <= fs->fs_cgrotor; cg++)
+               for (cg = 0; cg <= startcg; cg++)

                        if (fs->fs_cs(fs, cg).cs_nbfree >= avgbfree) {
                                fs->fs_cgrotor = cg;
                                return (fs->fs_fpg * cg + fs->fs_frag);
                        if (fs->fs_cs(fs, cg).cs_nbfree >= avgbfree) {
                                fs->fs_cgrotor = cg;
                                return (fs->fs_fpg * cg + fs->fs_frag);


@@ -420,19 +515,24 @@ fragextend(ip, cg, bprev, osize, nsize)
        frags = numfrags(fs, nsize);
        bbase = fragnum(fs, bprev);
        if (bbase > fragnum(fs, (bprev + frags - 1))) {
        frags = numfrags(fs, nsize);
        bbase = fragnum(fs, bprev);
        if (bbase > fragnum(fs, (bprev + frags - 1))) {

-               /* cannot extend across a block boundry */
+               /* cannot extend across a block boundary */

                return (NULL);
        }
                return (NULL);
        }

+#ifdef SECSIZE
+       bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize,
+           fs->fs_dbsize);
+#else SECSIZE

        bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize);
        bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize);

+#endif SECSIZE

        cgp = bp->b_un.b_cg;
        cgp = bp->b_un.b_cg;

-       if (bp->b_flags & B_ERROR || cgp->cg_magic != CG_MAGIC) {
+       if (bp->b_flags & B_ERROR || !cg_chkmagic(cgp)) {

                brelse(bp);
                return (NULL);
        }
        cgp->cg_time = time.tv_sec;
        bno = dtogd(fs, bprev);
        for (i = numfrags(fs, osize); i < frags; i++)
                brelse(bp);
                return (NULL);
        }
        cgp->cg_time = time.tv_sec;
        bno = dtogd(fs, bprev);
        for (i = numfrags(fs, osize); i < frags; i++)

-               if (isclr(cgp->cg_free, bno + i)) {
+               if (isclr(cg_blksfree(cgp), bno + i)) {

                        brelse(bp);
                        return (NULL);
                }
                        brelse(bp);
                        return (NULL);
                }


@@ -443,13 +543,13 @@ fragextend(ip, cg, bprev, osize, nsize)
         * allocate the extended piece
         */
        for (i = frags; i < fs->fs_frag - bbase; i++)
         * allocate the extended piece
         */
        for (i = frags; i < fs->fs_frag - bbase; i++)

-               if (isclr(cgp->cg_free, bno + i))
+               if (isclr(cg_blksfree(cgp), bno + i))

                        break;
        cgp->cg_frsum[i - numfrags(fs, osize)]--;
        if (i != frags)
                cgp->cg_frsum[i - frags]++;
        for (i = numfrags(fs, osize); i < frags; i++) {
                        break;
        cgp->cg_frsum[i - numfrags(fs, osize)]--;
        if (i != frags)
                cgp->cg_frsum[i - frags]++;
        for (i = numfrags(fs, osize); i < frags; i++) {

-               clrbit(cgp->cg_free, bno + i);
+               clrbit(cg_blksfree(cgp), bno + i);

                cgp->cg_cs.cs_nffree--;
                fs->fs_cstotal.cs_nffree--;
                fs->fs_cs(fs, cg).cs_nffree--;
                cgp->cg_cs.cs_nffree--;
                fs->fs_cstotal.cs_nffree--;
                fs->fs_cs(fs, cg).cs_nffree--;


@@ -482,9 +582,14 @@ alloccg(ip, cg, bpref, size)
        fs = ip->i_fs;
        if (fs->fs_cs(fs, cg).cs_nbfree == 0 && size == fs->fs_bsize)
                return (NULL);
        fs = ip->i_fs;
        if (fs->fs_cs(fs, cg).cs_nbfree == 0 && size == fs->fs_bsize)
                return (NULL);

+#ifdef SECSIZE
+       bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize,
+           fs->fs_dbsize);
+#else SECSIZE

        bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize);
        bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize);

+#endif SECSIZE

        cgp = bp->b_un.b_cg;
        cgp = bp->b_un.b_cg;

-       if (bp->b_flags & B_ERROR || cgp->cg_magic != CG_MAGIC ||
+       if (bp->b_flags & B_ERROR || !cg_chkmagic(cgp) ||

            (cgp->cg_cs.cs_nbfree == 0 && size == fs->fs_bsize)) {
                brelse(bp);
                return (NULL);
            (cgp->cg_cs.cs_nbfree == 0 && size == fs->fs_bsize)) {
                brelse(bp);
                return (NULL);


@@ -516,7 +621,7 @@ alloccg(ip, cg, bpref, size)
                bno = alloccgblk(fs, cgp, bpref);
                bpref = dtogd(fs, bno);
                for (i = frags; i < fs->fs_frag; i++)
                bno = alloccgblk(fs, cgp, bpref);
                bpref = dtogd(fs, bno);
                for (i = frags; i < fs->fs_frag; i++)

-                       setbit(cgp->cg_free, bpref + i);
+                       setbit(cg_blksfree(cgp), bpref + i);

                i = fs->fs_frag - frags;
                cgp->cg_cs.cs_nffree += i;
                fs->fs_cstotal.cs_nffree += i;
                i = fs->fs_frag - frags;
                cgp->cg_cs.cs_nffree += i;
                fs->fs_cstotal.cs_nffree += i;


@@ -532,7 +637,7 @@ alloccg(ip, cg, bpref, size)
                return (NULL);
        }
        for (i = 0; i < frags; i++)
                return (NULL);
        }
        for (i = 0; i < frags; i++)

-               clrbit(cgp->cg_free, bno + i);
+               clrbit(cg_blksfree(cgp), bno + i);

        cgp->cg_cs.cs_nffree -= frags;
        fs->fs_cstotal.cs_nffree -= frags;
        fs->fs_cs(fs, cg).cs_nffree -= frags;
        cgp->cg_cs.cs_nffree -= frags;
        fs->fs_cstotal.cs_nffree -= frags;
        fs->fs_cs(fs, cg).cs_nffree -= frags;


@@ -575,7 +680,7 @@ alloccgblk(fs, cgp, bpref)
        /*
         * if the requested block is available, use it
         */
        /*
         * if the requested block is available, use it
         */

-       if (isblock(fs, cgp->cg_free, fragstoblks(fs, bpref))) {
+       if (isblock(fs, cg_blksfree(cgp), fragstoblks(fs, bpref))) {

                bno = bpref;
                goto gotit;
        }
                bno = bpref;
                goto gotit;
        }


@@ -583,7 +688,7 @@ alloccgblk(fs, cgp, bpref)
         * check for a block available on the same cylinder
         */
        cylno = cbtocylno(fs, bpref);
         * check for a block available on the same cylinder
         */
        cylno = cbtocylno(fs, bpref);

-       if (cgp->cg_btot[cylno] == 0)
+       if (cg_blktot(cgp)[cylno] == 0)

                goto norot;
        if (fs->fs_cpc == 0) {
                /*
                goto norot;
        if (fs->fs_cpc == 0) {
                /*


@@ -598,12 +703,12 @@ alloccgblk(fs, cgp, bpref)
         * available in the requested cylinder starting at the
         * requested rotational position and proceeding around.
         */
         * available in the requested cylinder starting at the
         * requested rotational position and proceeding around.
         */

-       cylbp = cgp->cg_b[cylno];
+       cylbp = cg_blks(fs, cgp, cylno);

        pos = cbtorpos(fs, bpref);
        pos = cbtorpos(fs, bpref);

-       for (i = pos; i < NRPOS; i++)
+       for (i = pos; i < fs->fs_nrpos; i++)

                if (cylbp[i] > 0)
                        break;
                if (cylbp[i] > 0)
                        break;

-       if (i == NRPOS)
+       if (i == fs->fs_nrpos)

                for (i = 0; i < pos; i++)
                        if (cylbp[i] > 0)
                                break;
                for (i = 0; i < pos; i++)
                        if (cylbp[i] > 0)
                                break;


@@ -614,18 +719,19 @@ alloccgblk(fs, cgp, bpref)
                 */
                pos = cylno % fs->fs_cpc;
                bno = (cylno - pos) * fs->fs_spc / NSPB(fs);
                 */
                pos = cylno % fs->fs_cpc;
                bno = (cylno - pos) * fs->fs_spc / NSPB(fs);

-               if (fs->fs_postbl[pos][i] == -1) {
+               if (fs_postbl(fs, pos)[i] == -1) {

                        printf("pos = %d, i = %d, fs = %s\n",
                            pos, i, fs->fs_fsmnt);
                        panic("alloccgblk: cyl groups corrupted");
                }
                        printf("pos = %d, i = %d, fs = %s\n",
                            pos, i, fs->fs_fsmnt);
                        panic("alloccgblk: cyl groups corrupted");
                }

-               for (i = fs->fs_postbl[pos][i];; ) {
-                       if (isblock(fs, cgp->cg_free, bno + i)) {
+               for (i = fs_postbl(fs, pos)[i];; ) {
+                       if (isblock(fs, cg_blksfree(cgp), bno + i)) {

                                bno = blkstofrags(fs, (bno + i));
                                goto gotit;
                        }
                                bno = blkstofrags(fs, (bno + i));
                                goto gotit;
                        }

-                       delta = fs->fs_rotbl[i];
-                       if (delta <= 0 || delta > MAXBPC - i)
+                       delta = fs_rotbl(fs)[i];
+                       if (delta <= 0 ||
+                           delta + i > fragstoblks(fs, fs->fs_fpg))

                                break;
                        i += delta;
                }
                                break;
                        i += delta;
                }


@@ -642,17 +748,17 @@ norot:
                return (NULL);
        cgp->cg_rotor = bno;
 gotit:
                return (NULL);
        cgp->cg_rotor = bno;
 gotit:

-       clrblock(fs, cgp->cg_free, (long)fragstoblks(fs, bno));
+       clrblock(fs, cg_blksfree(cgp), (long)fragstoblks(fs, bno));

        cgp->cg_cs.cs_nbfree--;
        fs->fs_cstotal.cs_nbfree--;
        fs->fs_cs(fs, cgp->cg_cgx).cs_nbfree--;
        cylno = cbtocylno(fs, bno);
        cgp->cg_cs.cs_nbfree--;
        fs->fs_cstotal.cs_nbfree--;
        fs->fs_cs(fs, cgp->cg_cgx).cs_nbfree--;
        cylno = cbtocylno(fs, bno);

-       cgp->cg_b[cylno][cbtorpos(fs, bno)]--;
-       cgp->cg_btot[cylno]--;
+       cg_blks(fs, cgp, cylno)[cbtorpos(fs, bno)]--;
+       cg_blktot(cgp)[cylno]--;

        fs->fs_fmod++;
        return (cgp->cg_cgx * fs->fs_fpg + bno);
 }
        fs->fs_fmod++;
        return (cgp->cg_cgx * fs->fs_fpg + bno);
 }

-       
+

 /*
  * Determine whether an inode can be allocated.
  *
 /*
  * Determine whether an inode can be allocated.
  *


@@ -677,9 +783,14 @@ ialloccg(ip, cg, ipref, mode)
        fs = ip->i_fs;
        if (fs->fs_cs(fs, cg).cs_nifree == 0)
                return (NULL);
        fs = ip->i_fs;
        if (fs->fs_cs(fs, cg).cs_nifree == 0)
                return (NULL);

+#ifdef SECSIZE
+       bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize,
+           fs->fs_dbsize);
+#else SECSIZE

        bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize);
        bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize);

+#endif SECSIZE

        cgp = bp->b_un.b_cg;
        cgp = bp->b_un.b_cg;

-       if (bp->b_flags & B_ERROR || cgp->cg_magic != CG_MAGIC ||
+       if (bp->b_flags & B_ERROR || !cg_chkmagic(cgp) ||

            cgp->cg_cs.cs_nifree == 0) {
                brelse(bp);
                return (NULL);
            cgp->cg_cs.cs_nifree == 0) {
                brelse(bp);
                return (NULL);


@@ -687,20 +798,25 @@ ialloccg(ip, cg, ipref, mode)
        cgp->cg_time = time.tv_sec;
        if (ipref) {
                ipref %= fs->fs_ipg;
        cgp->cg_time = time.tv_sec;
        if (ipref) {
                ipref %= fs->fs_ipg;

-               if (isclr(cgp->cg_iused, ipref))
+               if (isclr(cg_inosused(cgp), ipref))

                        goto gotit;
        }
        start = cgp->cg_irotor / NBBY;
        len = howmany(fs->fs_ipg - cgp->cg_irotor, NBBY);
                        goto gotit;
        }
        start = cgp->cg_irotor / NBBY;
        len = howmany(fs->fs_ipg - cgp->cg_irotor, NBBY);

-       loc = skpc(0xff, len, &cgp->cg_iused[start]);
+       loc = skpc(0xff, len, &cg_inosused(cgp)[start]);

        if (loc == 0) {
        if (loc == 0) {

-               printf("cg = %s, irotor = %d, fs = %s\n",
-                   cg, cgp->cg_irotor, fs->fs_fsmnt);
-               panic("ialloccg: map corrupted");
-               /* NOTREACHED */
+               len = start + 1;
+               start = 0;
+               loc = skpc(0xff, len, &cg_inosused(cgp)[0]);
+               if (loc == 0) {
+                       printf("cg = %s, irotor = %d, fs = %s\n",
+                           cg, cgp->cg_irotor, fs->fs_fsmnt);
+                       panic("ialloccg: map corrupted");
+                       /* NOTREACHED */
+               }

        }
        i = start + len - loc;
        }
        i = start + len - loc;

-       map = cgp->cg_iused[i];
+       map = cg_inosused(cgp)[i];

        ipref = i * NBBY;
        for (i = 1; i < (1 << NBBY); i <<= 1, ipref++) {
                if ((map & i) == 0) {
        ipref = i * NBBY;
        for (i = 1; i < (1 << NBBY); i <<= 1, ipref++) {
                if ((map & i) == 0) {


@@ -712,7 +828,7 @@ ialloccg(ip, cg, ipref, mode)
        panic("ialloccg: block not in map");
        /* NOTREACHED */
 gotit:
        panic("ialloccg: block not in map");
        /* NOTREACHED */
 gotit:

-       setbit(cgp->cg_iused, ipref);
+       setbit(cg_inosused(cgp), ipref);

        cgp->cg_cs.cs_nifree--;
        fs->fs_cstotal.cs_nifree--;
        fs->fs_cs(fs, cg).cs_nifree--;
        cgp->cg_cs.cs_nifree--;
        fs->fs_cstotal.cs_nifree--;
        fs->fs_cs(fs, cg).cs_nifree--;


@@ -733,7 +849,7 @@ gotit:
  * free map. If a fragment is deallocated, a possible 
  * block reassembly is checked.
  */
  * free map. If a fragment is deallocated, a possible 
  * block reassembly is checked.
  */

-free(ip, bno, size)
+blkfree(ip, bno, size)

        register struct inode *ip;
        daddr_t bno;
        off_t size;
        register struct inode *ip;
        daddr_t bno;
        off_t size;


@@ -748,52 +864,57 @@ free(ip, bno, size)
        if ((unsigned)size > fs->fs_bsize || fragoff(fs, size) != 0) {
                printf("dev = 0x%x, bsize = %d, size = %d, fs = %s\n",
                    ip->i_dev, fs->fs_bsize, size, fs->fs_fsmnt);
        if ((unsigned)size > fs->fs_bsize || fragoff(fs, size) != 0) {
                printf("dev = 0x%x, bsize = %d, size = %d, fs = %s\n",
                    ip->i_dev, fs->fs_bsize, size, fs->fs_fsmnt);

-               panic("free: bad size");
+               panic("blkfree: bad size");

        }
        cg = dtog(fs, bno);
        if (badblock(fs, bno)) {
                printf("bad block %d, ino %d\n", bno, ip->i_number);
                return;
        }
        }
        cg = dtog(fs, bno);
        if (badblock(fs, bno)) {
                printf("bad block %d, ino %d\n", bno, ip->i_number);
                return;
        }

+#ifdef SECSIZE
+       bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize,
+           fs->fs_dbsize);
+#else SECSIZE

        bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize);
        bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize);

+#endif SECSIZE

        cgp = bp->b_un.b_cg;
        cgp = bp->b_un.b_cg;

-       if (bp->b_flags & B_ERROR || cgp->cg_magic != CG_MAGIC) {
+       if (bp->b_flags & B_ERROR || !cg_chkmagic(cgp)) {

                brelse(bp);
                return;
        }
        cgp->cg_time = time.tv_sec;
        bno = dtogd(fs, bno);
        if (size == fs->fs_bsize) {
                brelse(bp);
                return;
        }
        cgp->cg_time = time.tv_sec;
        bno = dtogd(fs, bno);
        if (size == fs->fs_bsize) {

-               if (isblock(fs, cgp->cg_free, fragstoblks(fs, bno))) {
+               if (isblock(fs, cg_blksfree(cgp), fragstoblks(fs, bno))) {

                        printf("dev = 0x%x, block = %d, fs = %s\n",
                            ip->i_dev, bno, fs->fs_fsmnt);
                        printf("dev = 0x%x, block = %d, fs = %s\n",
                            ip->i_dev, bno, fs->fs_fsmnt);

-                       panic("free: freeing free block");
+                       panic("blkfree: freeing free block");

                }
                }

-               setblock(fs, cgp->cg_free, fragstoblks(fs, bno));
+               setblock(fs, cg_blksfree(cgp), fragstoblks(fs, bno));

                cgp->cg_cs.cs_nbfree++;
                fs->fs_cstotal.cs_nbfree++;
                fs->fs_cs(fs, cg).cs_nbfree++;
                i = cbtocylno(fs, bno);
                cgp->cg_cs.cs_nbfree++;
                fs->fs_cstotal.cs_nbfree++;
                fs->fs_cs(fs, cg).cs_nbfree++;
                i = cbtocylno(fs, bno);

-               cgp->cg_b[i][cbtorpos(fs, bno)]++;
-               cgp->cg_btot[i]++;
+               cg_blks(fs, cgp, i)[cbtorpos(fs, bno)]++;
+               cg_blktot(cgp)[i]++;

        } else {
                bbase = bno - fragnum(fs, bno);
                /*
                 * decrement the counts associated with the old frags
                 */
        } else {
                bbase = bno - fragnum(fs, bno);
                /*
                 * decrement the counts associated with the old frags
                 */

-               blk = blkmap(fs, cgp->cg_free, bbase);
+               blk = blkmap(fs, cg_blksfree(cgp), bbase);

                fragacct(fs, blk, cgp->cg_frsum, -1);
                /*
                 * deallocate the fragment
                 */
                frags = numfrags(fs, size);
                for (i = 0; i < frags; i++) {
                fragacct(fs, blk, cgp->cg_frsum, -1);
                /*
                 * deallocate the fragment
                 */
                frags = numfrags(fs, size);
                for (i = 0; i < frags; i++) {

-                       if (isset(cgp->cg_free, bno + i)) {
+                       if (isset(cg_blksfree(cgp), bno + i)) {

                                printf("dev = 0x%x, block = %d, fs = %s\n",
                                    ip->i_dev, bno + i, fs->fs_fsmnt);
                                printf("dev = 0x%x, block = %d, fs = %s\n",
                                    ip->i_dev, bno + i, fs->fs_fsmnt);

-                               panic("free: freeing free frag");
+                               panic("blkfree: freeing free frag");

                        }
                        }

-                       setbit(cgp->cg_free, bno + i);
+                       setbit(cg_blksfree(cgp), bno + i);

                }
                cgp->cg_cs.cs_nffree += i;
                fs->fs_cstotal.cs_nffree += i;
                }
                cgp->cg_cs.cs_nffree += i;
                fs->fs_cstotal.cs_nffree += i;


@@ -801,12 +922,12 @@ free(ip, bno, size)
                /*
                 * add back in counts associated with the new frags
                 */
                /*
                 * add back in counts associated with the new frags
                 */

-               blk = blkmap(fs, cgp->cg_free, bbase);
+               blk = blkmap(fs, cg_blksfree(cgp), bbase);

                fragacct(fs, blk, cgp->cg_frsum, 1);
                /*
                 * if a complete block has been reassembled, account for it
                 */
                fragacct(fs, blk, cgp->cg_frsum, 1);
                /*
                 * if a complete block has been reassembled, account for it
                 */

-               if (isblock(fs, cgp->cg_free, fragstoblks(fs, bbase))) {
+               if (isblock(fs, cg_blksfree(cgp), fragstoblks(fs, bbase))) {

                        cgp->cg_cs.cs_nffree -= fs->fs_frag;
                        fs->fs_cstotal.cs_nffree -= fs->fs_frag;
                        fs->fs_cs(fs, cg).cs_nffree -= fs->fs_frag;
                        cgp->cg_cs.cs_nffree -= fs->fs_frag;
                        fs->fs_cstotal.cs_nffree -= fs->fs_frag;
                        fs->fs_cs(fs, cg).cs_nffree -= fs->fs_frag;


@@ -814,8 +935,8 @@ free(ip, bno, size)
                        fs->fs_cstotal.cs_nbfree++;
                        fs->fs_cs(fs, cg).cs_nbfree++;
                        i = cbtocylno(fs, bbase);
                        fs->fs_cstotal.cs_nbfree++;
                        fs->fs_cs(fs, cg).cs_nbfree++;
                        i = cbtocylno(fs, bbase);

-                       cgp->cg_b[i][cbtorpos(fs, bbase)]++;
-                       cgp->cg_btot[i]++;
+                       cg_blks(fs, cgp, i)[cbtorpos(fs, bbase)]++;
+                       cg_blktot(cgp)[i]++;

                }
        }
        fs->fs_fmod++;
                }
        }
        fs->fs_fmod++;


@@ -844,20 +965,25 @@ ifree(ip, ino, mode)
                panic("ifree: range");
        }
        cg = itog(fs, ino);
                panic("ifree: range");
        }
        cg = itog(fs, ino);

+#ifdef SECSIZE
+       bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize,
+           fs->fs_dbsize);
+#else SECSIZE

        bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize);
        bp = bread(ip->i_dev, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize);

+#endif SECSIZE

        cgp = bp->b_un.b_cg;
        cgp = bp->b_un.b_cg;

-       if (bp->b_flags & B_ERROR || cgp->cg_magic != CG_MAGIC) {
+       if (bp->b_flags & B_ERROR || !cg_chkmagic(cgp)) {

                brelse(bp);
                return;
        }
        cgp->cg_time = time.tv_sec;
        ino %= fs->fs_ipg;
                brelse(bp);
                return;
        }
        cgp->cg_time = time.tv_sec;
        ino %= fs->fs_ipg;

-       if (isclr(cgp->cg_iused, ino)) {
+       if (isclr(cg_inosused(cgp), ino)) {

                printf("dev = 0x%x, ino = %d, fs = %s\n",
                    ip->i_dev, ino, fs->fs_fsmnt);
                panic("ifree: freeing free inode");
        }
                printf("dev = 0x%x, ino = %d, fs = %s\n",
                    ip->i_dev, ino, fs->fs_fsmnt);
                panic("ifree: freeing free inode");
        }

-       clrbit(cgp->cg_iused, ino);
+       clrbit(cg_inosused(cgp), ino);

        if (ino < cgp->cg_irotor)
                cgp->cg_irotor = ino;
        cgp->cg_cs.cs_nifree++;
        if (ino < cgp->cg_irotor)
                cgp->cg_irotor = ino;
        cgp->cg_cs.cs_nifree++;


@@ -898,20 +1024,20 @@ mapsearch(fs, cgp, bpref, allocsiz)
        else
                start = cgp->cg_frotor / NBBY;
        len = howmany(fs->fs_fpg, NBBY) - start;
        else
                start = cgp->cg_frotor / NBBY;
        len = howmany(fs->fs_fpg, NBBY) - start;

-       loc = scanc((unsigned)len, (caddr_t)&cgp->cg_free[start],
+       loc = scanc((unsigned)len, (caddr_t)&cg_blksfree(cgp)[start],

                (caddr_t)fragtbl[fs->fs_frag],
                (int)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY))));
        if (loc == 0) {
                len = start + 1;
                start = 0;
                (caddr_t)fragtbl[fs->fs_frag],
                (int)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY))));
        if (loc == 0) {
                len = start + 1;
                start = 0;

-               loc = scanc((unsigned)len, (caddr_t)&cgp->cg_free[start],
+               loc = scanc((unsigned)len, (caddr_t)&cg_blksfree(cgp)[0],

                        (caddr_t)fragtbl[fs->fs_frag],
                        (int)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY))));
                if (loc == 0) {
                        printf("start = %d, len = %d, fs = %s\n",
                            start, len, fs->fs_fsmnt);
                        panic("alloccg: map corrupted");
                        (caddr_t)fragtbl[fs->fs_frag],
                        (int)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY))));
                if (loc == 0) {
                        printf("start = %d, len = %d, fs = %s\n",
                            start, len, fs->fs_fsmnt);
                        panic("alloccg: map corrupted");

-                       return (-1);
+                       /* NOTREACHED */

                }
        }
        bno = (start + len - loc) * NBBY;
                }
        }
        bno = (start + len - loc) * NBBY;


@@ -921,7 +1047,7 @@ mapsearch(fs, cgp, bpref, allocsiz)
         * sift through the bits to find the selected frag
         */
        for (i = bno + NBBY; bno < i; bno += fs->fs_frag) {
         * sift through the bits to find the selected frag
         */
        for (i = bno + NBBY; bno < i; bno += fs->fs_frag) {

-               blk = blkmap(fs, cgp->cg_free, bno);
+               blk = blkmap(fs, cg_blksfree(cgp), bno);

                blk <<= 1;
                field = around[allocsiz];
                subfield = inside[allocsiz];
                blk <<= 1;
                field = around[allocsiz];
                subfield = inside[allocsiz];


@@ -948,5 +1074,5 @@ fserr(fs, cp)
        char *cp;
 {
 
        char *cp;
 {
 

-       printf("%s: %s\n", fs->fs_fsmnt, cp);
+       log(LOG_ERR, "%s: %s\n", fs->fs_fsmnt, cp);

 }
 }