BSD 4_4 release

[unix-history] / usr / src / sys / ufs / ffs / ffs_alloc.c

diff --git a/usr/src/sys/ufs/ffs/ffs_alloc.c b/usr/src/sys/ufs/ffs/ffs_alloc.c
index 9760210..5bc3787 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_alloc.c
+++ b/usr/src/sys/ufs/ffs/ffs_alloc.c
@@ -1,33 +1,66 @@
 /*
 /*

- * 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.
+ * Copyright (c) 1982, 1986, 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- *     @(#)ffs_alloc.c 7.4 (Berkeley) %G%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)ffs_alloc.c 8.1 (Berkeley) 6/11/93

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "mount.h"
-#include "fs.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"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/proc.h>
+#include <sys/vnode.h>
+#include <sys/mount.h>
+#include <sys/kernel.h>
+#include <sys/syslog.h>
+
+#include <vm/vm.h>
+
+#include <ufs/ufs/quota.h>
+#include <ufs/ufs/inode.h>

 
 

-extern u_long          hashalloc();
-extern ino_t           ialloccg();
-extern daddr_t         alloccg();
-extern daddr_t         alloccgblk();
-extern daddr_t         fragextend();
-extern daddr_t         blkpref();
-extern daddr_t         mapsearch();
-extern int             inside[], around[];
-extern unsigned char   *fragtbl[];
+#include <ufs/ffs/fs.h>
+#include <ufs/ffs/ffs_extern.h>
+
+extern u_long nextgennumber;
+
+static daddr_t ffs_alloccg __P((struct inode *, int, daddr_t, int));
+static daddr_t ffs_alloccgblk __P((struct fs *, struct cg *, daddr_t));
+static ino_t   ffs_dirpref __P((struct fs *));
+static daddr_t ffs_fragextend __P((struct inode *, int, long, int, int));
+static void    ffs_fserr __P((struct fs *, u_int, char *));
+static u_long  ffs_hashalloc
+                   __P((struct inode *, int, long, int, u_long (*)()));
+static ino_t   ffs_ialloccg __P((struct inode *, int, daddr_t, int));
+static daddr_t ffs_mapsearch __P((struct fs *, struct cg *, daddr_t, int));

 
 /*
  * Allocate a block in the file system.
 
 /*
  * Allocate a block in the file system.


@@ -48,31 +81,36 @@ extern unsigned char        *fragtbl[];
  *   2) quadradically rehash into other cylinder groups, until an
  *      available block is located.
  */
  *   2) quadradically rehash into other cylinder groups, until an
  *      available block is located.
  */

-struct buf *
-alloc(ip, bpref, size)
+ffs_alloc(ip, lbn, bpref, size, cred, bnp)

        register struct inode *ip;
        register struct inode *ip;

-       daddr_t bpref;
+       daddr_t lbn, bpref;

        int size;
        int size;

+       struct ucred *cred;
+       daddr_t *bnp;

 {
        daddr_t bno;
        register struct fs *fs;
        register struct buf *bp;
 {
        daddr_t bno;
        register struct fs *fs;
        register struct buf *bp;

-       int cg;
+       int cg, error;

        
        

+       *bnp = 0;

        fs = ip->i_fs;
        fs = ip->i_fs;

+#ifdef DIAGNOSTIC

        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("alloc: bad size");
+               panic("ffs_alloc: bad size");

        }
        }

+       if (cred == NOCRED)
+               panic("ffs_alloc: missing credential\n");
+#endif /* DIAGNOSTIC */

        if (size == fs->fs_bsize && fs->fs_cstotal.cs_nbfree == 0)
                goto nospace;
        if (size == fs->fs_bsize && fs->fs_cstotal.cs_nbfree == 0)
                goto nospace;

-       if (u.u_uid != 0 && freespace(fs, fs->fs_minfree) <= 0)
+       if (cred->cr_uid != 0 && freespace(fs, fs->fs_minfree) <= 0)

                goto nospace;
 #ifdef QUOTA
                goto nospace;
 #ifdef QUOTA

-       u.u_error = chkdq(ip, (long)btodb(size), 0);
-       if (u.u_error)
-               return (NULL);
+       if (error = chkdq(ip, (long)btodb(size), cred, 0))
+               return (error);

 #endif
        if (bpref >= fs->fs_size)
                bpref = 0;
 #endif
        if (bpref >= fs->fs_size)
                bpref = 0;


@@ -80,24 +118,24 @@ alloc(ip, bpref, size)
                cg = itog(fs, ip->i_number);
        else
                cg = dtog(fs, bpref);
                cg = itog(fs, ip->i_number);
        else
                cg = dtog(fs, bpref);

-       bno = (daddr_t)hashalloc(ip, cg, (long)bpref, size,
-               (u_long (*)())alloccg);
-       if (bno <= 0)
-               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);
-#endif SECSIZE
-       clrbuf(bp);
-       return (bp);
+       bno = (daddr_t)ffs_hashalloc(ip, cg, (long)bpref, size,
+           (u_long (*)())ffs_alloccg);
+       if (bno > 0) {
+               ip->i_blocks += btodb(size);
+               ip->i_flag |= IUPD|ICHG;
+               *bnp = bno;
+               return (0);
+       }
+#ifdef QUOTA
+       /*
+        * Restore user's disk quota because allocation failed.
+        */
+       (void) chkdq(ip, (long)-btodb(size), cred, FORCE);
+#endif

 nospace:
 nospace:

-       fserr(fs, "file system full");
+       ffs_fserr(fs, cred->cr_uid, "file system full");

        uprintf("\n%s: write failed, file system is full\n", fs->fs_fsmnt);
        uprintf("\n%s: write failed, file system is full\n", fs->fs_fsmnt);

-       u.u_error = ENOSPC;
-       return (NULL);
+       return (ENOSPC);

 }
 
 /*
 }
 
 /*


@@ -108,58 +146,70 @@ nospace:
  * the original block. Failing that, the regular block allocator is
  * invoked to get an appropriate block.
  */
  * the original block. Failing that, the regular block allocator is
  * invoked to get an appropriate block.
  */

-struct buf *
-realloccg(ip, bprev, bpref, osize, nsize)
+ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp)

        register struct inode *ip;
        register struct inode *ip;

-       daddr_t bprev, bpref;
+       daddr_t lbprev;
+       daddr_t bpref;

        int osize, nsize;
        int osize, nsize;

+       struct ucred *cred;
+       struct buf **bpp;

 {
        register struct fs *fs;
 {
        register struct fs *fs;

-       register struct buf *bp, *obp;
-       int cg, request;
-       daddr_t bno, bn;
-       int i, count;
+       struct buf *bp, *obp;
+       int cg, request, error;
+       daddr_t bprev, bno;

        
        

+       *bpp = 0;

        fs = ip->i_fs;
        fs = ip->i_fs;

+#ifdef DIAGNOSTIC

        if ((unsigned)osize > fs->fs_bsize || fragoff(fs, osize) != 0 ||
            (unsigned)nsize > fs->fs_bsize || fragoff(fs, nsize) != 0) {
        if ((unsigned)osize > fs->fs_bsize || fragoff(fs, osize) != 0 ||
            (unsigned)nsize > fs->fs_bsize || fragoff(fs, nsize) != 0) {

-               printf("dev = 0x%x, bsize = %d, osize = %d, nsize = %d, fs = %s\n",
+               printf(
+                   "dev = 0x%x, bsize = %d, osize = %d, nsize = %d, fs = %s\n",

                    ip->i_dev, fs->fs_bsize, osize, nsize, fs->fs_fsmnt);
                    ip->i_dev, fs->fs_bsize, osize, nsize, fs->fs_fsmnt);

-               panic("realloccg: bad size");
+               panic("ffs_realloccg: bad size");

        }
        }

-       if (u.u_uid != 0 && freespace(fs, fs->fs_minfree) <= 0)
+       if (cred == NOCRED)
+               panic("ffs_realloccg: missing credential\n");
+#endif /* DIAGNOSTIC */
+       if (cred->cr_uid != 0 && freespace(fs, fs->fs_minfree) <= 0)

                goto nospace;
                goto nospace;

-       if (bprev == 0) {
+       if ((bprev = ip->i_db[lbprev]) == 0) {

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

-               panic("realloccg: bad bprev");
+               panic("ffs_realloccg: bad bprev");
+       }
+       /*
+        * Allocate the extra space in the buffer.
+        */
+       if (error = bread(ITOV(ip), lbprev, osize, NOCRED, &bp)) {
+               brelse(bp);
+               return (error);

        }
 #ifdef QUOTA
        }
 #ifdef QUOTA

-       u.u_error = chkdq(ip, (long)btodb(nsize - osize), 0);
-       if (u.u_error)
-               return (NULL);
+       if (error = chkdq(ip, (long)btodb(nsize - osize), cred, 0)) {
+               brelse(bp);
+               return (error);
+       }

 #endif
 #endif

+       /*
+        * Check for extension in the existing location.
+        */

        cg = dtog(fs, bprev);
        cg = dtog(fs, bprev);

-       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);
-#endif SECSIZE
-                       if (bp->b_flags & B_ERROR) {
-                               brelse(bp);
-                               return (NULL);
-                       }
-               } while (brealloc(bp, nsize) == 0);
-               bp->b_flags |= B_DONE;
-               bzero(bp->b_un.b_addr + osize, (unsigned)nsize - osize);
+       if (bno = ffs_fragextend(ip, cg, (long)bprev, osize, nsize)) {
+               if (bp->b_blkno != fsbtodb(fs, bno))
+                       panic("bad blockno");

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

-               return (bp);
+               allocbuf(bp, nsize);
+               bp->b_flags |= B_DONE;
+               bzero(bp->b_un.b_addr + osize, (unsigned)nsize - osize);
+               *bpp = bp;
+               return (0);

        }
        }

+       /*
+        * Allocate a new disk location.
+        */

        if (bpref >= fs->fs_size)
                bpref = 0;
        switch ((int)fs->fs_optim) {
        if (bpref >= fs->fs_size)
                bpref = 0;
        switch ((int)fs->fs_optim) {


@@ -182,14 +232,14 @@ realloccg(ip, bprev, bpref, osize, nsize)
                break;
        case 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.
+                * 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 `ffs_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 <
                 */
                request = fs->fs_bsize;
                if (fs->fs_cstotal.cs_nffree <


@@ -202,66 +252,48 @@ realloccg(ip, bprev, bpref, osize, nsize)
        default:
                printf("dev = 0x%x, optim = %d, fs = %s\n",
                    ip->i_dev, fs->fs_optim, fs->fs_fsmnt);
        default:
                printf("dev = 0x%x, optim = %d, fs = %s\n",
                    ip->i_dev, fs->fs_optim, fs->fs_fsmnt);

-               panic("realloccg: bad optim");
+               panic("ffs_realloccg: bad optim");

                /* NOTREACHED */
        }
                /* NOTREACHED */
        }

-       bno = (daddr_t)hashalloc(ip, cg, (long)bpref, request,
-               (u_long (*)())alloccg);
+       bno = (daddr_t)ffs_hashalloc(ip, cg, (long)bpref, request,
+           (u_long (*)())ffs_alloccg);

        if (bno > 0) {
        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);
-#endif SECSIZE
-               if (obp->b_flags & B_ERROR) {
-                       brelse(obp);
-                       return (NULL);
-               }
-               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);
-               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);
-               if (obp->b_flags & B_DELWRI) {
-                       obp->b_flags &= ~B_DELWRI;
-                       u.u_ru.ru_oublock--;            /* delete charge */
-               }
-               brelse(obp);
-               blkfree(ip, bprev, (off_t)osize);
+               bp->b_blkno = fsbtodb(fs, bno);
+               (void) vnode_pager_uncache(ITOV(ip));
+               ffs_blkfree(ip, bprev, (long)osize);

                if (nsize < request)
                if (nsize < request)

-                       blkfree(ip, bno + numfrags(fs, nsize),
-                               (off_t)(request - nsize));
+                       ffs_blkfree(ip, bno + numfrags(fs, nsize),
+                           (long)(request - nsize));

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

-               return (bp);
+               allocbuf(bp, nsize);
+               bp->b_flags |= B_DONE;
+               bzero(bp->b_un.b_addr + osize, (unsigned)nsize - osize);
+               *bpp = bp;
+               return (0);

        }
        }

+#ifdef QUOTA
+       /*
+        * Restore user's disk quota because allocation failed.
+        */
+       (void) chkdq(ip, (long)-btodb(nsize - osize), cred, FORCE);
+#endif
+       brelse(bp);

 nospace:
        /*
         * no space available
         */
 nospace:
        /*
         * no space available
         */

-       fserr(fs, "file system full");
+       ffs_fserr(fs, cred->cr_uid, "file system full");

        uprintf("\n%s: write failed, file system is full\n", fs->fs_fsmnt);
        uprintf("\n%s: write failed, file system is full\n", fs->fs_fsmnt);

-       u.u_error = ENOSPC;
-       return (NULL);
+       return (ENOSPC);

 }
 
 /*
  * Allocate an inode in the file system.
  * 
 }
 
 /*
  * Allocate an inode in the file system.
  * 

- * A preference may be optionally specified. If a preference is given
- * the following hierarchy is used to allocate an inode:
- *   1) allocate the requested inode.
+ * If allocating a directory, use ffs_dirpref to select the inode.
+ * If allocating in a directory, the following hierarchy is followed:
+ *   1) allocate the preferred inode.

  *   2) allocate an inode in the same cylinder group.
  *   3) quadradically rehash into other cylinder groups, until an
  *      available inode is located.
  *   2) allocate an inode in the same cylinder group.
  *   3) quadradically rehash into other cylinder groups, until an
  *      available inode is located.


@@ -271,52 +303,66 @@ nospace:
  *   2) quadradically rehash into other cylinder groups, until an
  *      available inode is located.
  */
  *   2) quadradically rehash into other cylinder groups, until an
  *      available inode is located.
  */

-struct inode *
-ialloc(pip, ipref, mode)
-       register struct inode *pip;
-       ino_t ipref;
-       int mode;
+ffs_valloc(ap)
+       struct vop_valloc_args /* {
+               struct vnode *a_pvp;
+               int a_mode;
+               struct ucred *a_cred;
+               struct vnode **a_vpp;
+       } */ *ap;

 {
 {

-       ino_t ino;
+       register struct vnode *pvp = ap->a_pvp;
+       register struct inode *pip;

        register struct fs *fs;
        register struct inode *ip;
        register struct fs *fs;
        register struct inode *ip;

-       int cg;
+       mode_t mode = ap->a_mode;
+       ino_t ino, ipref;
+       int cg, error;

        
        

+       *ap->a_vpp = NULL;
+       pip = VTOI(pvp);

        fs = pip->i_fs;
        if (fs->fs_cstotal.cs_nifree == 0)
                goto noinodes;
        fs = pip->i_fs;
        if (fs->fs_cstotal.cs_nifree == 0)
                goto noinodes;

-#ifdef QUOTA
-       u.u_error = chkiq(pip->i_dev, (struct inode *)NULL, u.u_uid, 0);
-       if (u.u_error)
-               return (NULL);
-#endif
+
+       if ((mode & IFMT) == IFDIR)
+               ipref = ffs_dirpref(fs);
+       else
+               ipref = pip->i_number;

        if (ipref >= fs->fs_ncg * fs->fs_ipg)
                ipref = 0;
        cg = itog(fs, ipref);
        if (ipref >= fs->fs_ncg * fs->fs_ipg)
                ipref = 0;
        cg = itog(fs, ipref);

-       ino = (ino_t)hashalloc(pip, cg, (long)ipref, mode, ialloccg);
+       ino = (ino_t)ffs_hashalloc(pip, cg, (long)ipref, mode, ffs_ialloccg);

        if (ino == 0)
                goto noinodes;
        if (ino == 0)
                goto noinodes;

-       ip = iget(pip->i_dev, pip->i_fs, ino);
-       if (ip == NULL) {
-               ifree(pip, ino, 0);
-               return (NULL);
+       error = VFS_VGET(pvp->v_mount, ino, ap->a_vpp);
+       if (error) {
+               VOP_VFREE(pvp, ino, mode);
+               return (error);

        }
        }

+       ip = VTOI(*ap->a_vpp);

        if (ip->i_mode) {
                printf("mode = 0%o, inum = %d, fs = %s\n",
                    ip->i_mode, ip->i_number, fs->fs_fsmnt);
        if (ip->i_mode) {
                printf("mode = 0%o, inum = %d, fs = %s\n",
                    ip->i_mode, ip->i_number, fs->fs_fsmnt);

-               panic("ialloc: dup alloc");
+               panic("ffs_valloc: dup alloc");

        }
        if (ip->i_blocks) {                             /* XXX */
                printf("free inode %s/%d had %d blocks\n",
                    fs->fs_fsmnt, ino, ip->i_blocks);
                ip->i_blocks = 0;
        }
        }
        if (ip->i_blocks) {                             /* XXX */
                printf("free inode %s/%d had %d blocks\n",
                    fs->fs_fsmnt, ino, ip->i_blocks);
                ip->i_blocks = 0;
        }

-       return (ip);
+       ip->i_flags = 0;
+       /*
+        * Set up a new generation number for this inode.
+        */
+       if (++nextgennumber < (u_long)time.tv_sec)
+               nextgennumber = time.tv_sec;
+       ip->i_gen = nextgennumber;
+       return (0);

 noinodes:
 noinodes:

-       fserr(fs, "out of inodes");
+       ffs_fserr(fs, ap->a_cred->cr_uid, "out of inodes");

        uprintf("\n%s: create/symlink failed, no inodes free\n", fs->fs_fsmnt);
        uprintf("\n%s: create/symlink failed, no inodes free\n", fs->fs_fsmnt);

-       u.u_error = ENOSPC;
-       return (NULL);
+       return (ENOSPC);

 }
 
 /*
 }
 
 /*


@@ -326,8 +372,8 @@ noinodes:
  * among those cylinder groups with above the average number of
  * free inodes, the one with the smallest number of directories.
  */
  * among those cylinder groups with above the average number of
  * free inodes, the one with the smallest number of directories.
  */

-ino_t
-dirpref(fs)
+static ino_t
+ffs_dirpref(fs)

        register struct fs *fs;
 {
        int cg, minndir, mincg, avgifree;
        register struct fs *fs;
 {
        int cg, minndir, mincg, avgifree;


@@ -371,7 +417,7 @@ dirpref(fs)
  * schedule another I/O transfer.
  */
 daddr_t
  * schedule another I/O transfer.
  */
 daddr_t

-blkpref(ip, lbn, indx, bap)
+ffs_blkpref(ip, lbn, indx, bap)

        struct inode *ip;
        daddr_t lbn;
        int indx;
        struct inode *ip;
        daddr_t lbn;
        int indx;


@@ -417,9 +463,8 @@ blkpref(ip, lbn, indx, bap)
         * requested rotationally delayed by fs_rotdelay milliseconds.
         */
        nextblk = bap[indx - 1] + fs->fs_frag;
         * requested rotationally delayed by fs_rotdelay milliseconds.
         */
        nextblk = bap[indx - 1] + fs->fs_frag;

-       if (indx > fs->fs_maxcontig &&
-           bap[indx - fs->fs_maxcontig] + blkstofrags(fs, fs->fs_maxcontig)
-           != nextblk)
+       if (indx < fs->fs_maxcontig || bap[indx - fs->fs_maxcontig] +
+           blkstofrags(fs, fs->fs_maxcontig) != nextblk)

                return (nextblk);
        if (fs->fs_rotdelay != 0)
                /*
                return (nextblk);
        if (fs->fs_rotdelay != 0)
                /*


@@ -442,8 +487,8 @@ blkpref(ip, lbn, indx, bap)
  *   3) brute force search for a free block.
  */
 /*VARARGS5*/
  *   3) brute force search for a free block.
  */
 /*VARARGS5*/

-u_long
-hashalloc(ip, cg, pref, size, allocator)
+static u_long
+ffs_hashalloc(ip, cg, pref, size, allocator)

        struct inode *ip;
        int cg;
        long pref;
        struct inode *ip;
        int cg;
        long pref;


@@ -495,19 +540,19 @@ hashalloc(ip, cg, pref, size, allocator)
  * Check to see if the necessary fragments are available, and 
  * if they are, allocate them.
  */
  * Check to see if the necessary fragments are available, and 
  * if they are, allocate them.
  */

-daddr_t
-fragextend(ip, cg, bprev, osize, nsize)
+static daddr_t
+ffs_fragextend(ip, cg, bprev, osize, nsize)

        struct inode *ip;
        int cg;
        long bprev;
        int osize, nsize;
 {
        register struct fs *fs;
        struct inode *ip;
        int cg;
        long bprev;
        int osize, nsize;
 {
        register struct fs *fs;

-       register struct buf *bp;

        register struct cg *cgp;
        register struct cg *cgp;

+       struct buf *bp;

        long bno;
        int frags, bbase;
        long bno;
        int frags, bbase;

-       int i;
+       int i, error;

 
        fs = ip->i_fs;
        if (fs->fs_cs(fs, cg).cs_nffree < numfrags(fs, nsize - osize))
 
        fs = ip->i_fs;
        if (fs->fs_cs(fs, cg).cs_nffree < numfrags(fs, nsize - osize))


@@ -518,21 +563,21 @@ fragextend(ip, cg, bprev, osize, nsize)
                /* cannot extend across a block boundary */
                return (NULL);
        }
                /* cannot extend across a block boundary */
                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);
-#endif SECSIZE
+       error = bread(ip->i_devvp, fsbtodb(fs, cgtod(fs, cg)),
+               (int)fs->fs_cgsize, NOCRED, &bp);
+       if (error) {
+               brelse(bp);
+               return (NULL);
+       }

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

-       if (bp->b_flags & B_ERROR || cgp->cg_magic != CG_MAGIC) {
+       if (!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);
                }


@@ -543,18 +588,18 @@ 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--;
        }

-       fs->fs_fmod++;
+       fs->fs_fmod = 1;

        bdwrite(bp);
        return (bprev);
 }
        bdwrite(bp);
        return (bprev);
 }


@@ -565,38 +610,37 @@ fragextend(ip, cg, bprev, osize, nsize)
  * Check to see if a block of the apprpriate size is available,
  * and if it is, allocate it.
  */
  * Check to see if a block of the apprpriate size is available,
  * and if it is, allocate it.
  */

-daddr_t
-alloccg(ip, cg, bpref, size)
+static daddr_t
+ffs_alloccg(ip, cg, bpref, size)

        struct inode *ip;
        int cg;
        daddr_t bpref;
        int size;
 {
        register struct fs *fs;
        struct inode *ip;
        int cg;
        daddr_t bpref;
        int size;
 {
        register struct fs *fs;

-       register struct buf *bp;

        register struct cg *cgp;
        register struct cg *cgp;

-       int bno, frags;
-       int allocsiz;
+       struct buf *bp;

        register int i;
        register int i;

+       int error, bno, frags, allocsiz;

 
        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);
-#endif SECSIZE
+       error = bread(ip->i_devvp, fsbtodb(fs, cgtod(fs, cg)),
+               (int)fs->fs_cgsize, NOCRED, &bp);
+       if (error) {
+               brelse(bp);
+               return (NULL);
+       }

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

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

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

-               bno = alloccgblk(fs, cgp, bpref);
+               bno = ffs_alloccgblk(fs, cgp, bpref);

                bdwrite(bp);
                return (bno);
        }
                bdwrite(bp);
                return (bno);
        }


@@ -618,30 +662,30 @@ alloccg(ip, cg, bpref, size)
                        brelse(bp);
                        return (NULL);
                }
                        brelse(bp);
                        return (NULL);
                }

-               bno = alloccgblk(fs, cgp, bpref);
+               bno = ffs_alloccgblk(fs, cgp, bpref);

                bpref = dtogd(fs, bno);
                for (i = frags; i < fs->fs_frag; i++)
                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;
                fs->fs_cs(fs, cg).cs_nffree += i;
                i = fs->fs_frag - frags;
                cgp->cg_cs.cs_nffree += i;
                fs->fs_cstotal.cs_nffree += i;
                fs->fs_cs(fs, cg).cs_nffree += i;

-               fs->fs_fmod++;
+               fs->fs_fmod = 1;

                cgp->cg_frsum[i]++;
                bdwrite(bp);
                return (bno);
        }
                cgp->cg_frsum[i]++;
                bdwrite(bp);
                return (bno);
        }

-       bno = mapsearch(fs, cgp, bpref, allocsiz);
+       bno = ffs_mapsearch(fs, cgp, bpref, allocsiz);

        if (bno < 0) {
                brelse(bp);
                return (NULL);
        }
        for (i = 0; i < frags; i++)
        if (bno < 0) {
                brelse(bp);
                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;

-       fs->fs_fmod++;
+       fs->fs_fmod = 1;

        cgp->cg_frsum[allocsiz]--;
        if (frags != allocsiz)
                cgp->cg_frsum[allocsiz - frags]++;
        cgp->cg_frsum[allocsiz]--;
        if (frags != allocsiz)
                cgp->cg_frsum[allocsiz - frags]++;


@@ -660,8 +704,8 @@ alloccg(ip, cg, bpref, size)
  * Note that this routine only allocates fs_bsize blocks; these
  * blocks may be fragmented by the routine that allocates them.
  */
  * Note that this routine only allocates fs_bsize blocks; these
  * blocks may be fragmented by the routine that allocates them.
  */

-daddr_t
-alloccgblk(fs, cgp, bpref)
+static daddr_t
+ffs_alloccgblk(fs, cgp, bpref)

        register struct fs *fs;
        register struct cg *cgp;
        daddr_t bpref;
        register struct fs *fs;
        register struct cg *cgp;
        daddr_t bpref;


@@ -680,7 +724,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 (ffs_isblock(fs, cg_blksfree(cgp), fragstoblks(fs, bpref))) {

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


@@ -688,14 +732,17 @@ 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) {
                /*

-                * block layout info is not available, so just have
-                * to take any block in this cylinder.
+                * Block layout information is not available.
+                * Leaving bpref unchanged means we take the
+                * next available free block following the one 
+                * we just allocated. Hopefully this will at
+                * least hit a track cache on drives of unknown
+                * geometry (e.g. SCSI).

                 */
                 */

-               bpref = howmany(fs->fs_spc * cylno, NSPF(fs));

                goto norot;
        }
        /*
                goto norot;
        }
        /*


@@ -703,12 +750,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;


@@ -719,45 +766,46 @@ 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);
                        printf("pos = %d, i = %d, fs = %s\n",
                            pos, i, fs->fs_fsmnt);

-                       panic("alloccgblk: cyl groups corrupted");
+                       panic("ffs_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 (ffs_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;
                }
                printf("pos = %d, i = %d, fs = %s\n", pos, i, fs->fs_fsmnt);
                                break;
                        i += delta;
                }
                printf("pos = %d, i = %d, fs = %s\n", pos, i, fs->fs_fsmnt);

-               panic("alloccgblk: can't find blk in cyl");
+               panic("ffs_alloccgblk: can't find blk in cyl");

        }
 norot:
        /*
         * no blocks in the requested cylinder, so take next
         * available one in this cylinder group.
         */
        }
 norot:
        /*
         * no blocks in the requested cylinder, so take next
         * available one in this cylinder group.
         */

-       bno = mapsearch(fs, cgp, bpref, (int)fs->fs_frag);
+       bno = ffs_mapsearch(fs, cgp, bpref, (int)fs->fs_frag);

        if (bno < 0)
                return (NULL);
        cgp->cg_rotor = bno;
 gotit:
        if (bno < 0)
                return (NULL);
        cgp->cg_rotor = bno;
 gotit:

-       clrblock(fs, cgp->cg_free, (long)fragstoblks(fs, bno));
+       ffs_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]--;
-       fs->fs_fmod++;
+       cg_blks(fs, cgp, cylno)[cbtorpos(fs, bno)]--;
+       cg_blktot(cgp)[cylno]--;
+       fs->fs_fmod = 1;

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

-       
+

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


@@ -767,8 +815,8 @@ gotit:
  *   2) allocate the next available inode after the requested
  *      inode in the specified cylinder group.
  */
  *   2) allocate the next available inode after the requested
  *      inode in the specified cylinder group.
  */

-ino_t
-ialloccg(ip, cg, ipref, mode)
+static ino_t
+ffs_ialloccg(ip, cg, ipref, mode)

        struct inode *ip;
        int cg;
        daddr_t ipref;
        struct inode *ip;
        int cg;
        daddr_t ipref;


@@ -777,45 +825,44 @@ ialloccg(ip, cg, ipref, mode)
        register struct fs *fs;
        register struct cg *cgp;
        struct buf *bp;
        register struct fs *fs;
        register struct cg *cgp;
        struct buf *bp;

-       int start, len, loc, map, i;
+       int error, start, len, loc, map, i;

 
        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);
-#endif SECSIZE
+       error = bread(ip->i_devvp, fsbtodb(fs, cgtod(fs, cg)),
+               (int)fs->fs_cgsize, NOCRED, &bp);
+       if (error) {
+               brelse(bp);
+               return (NULL);
+       }

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

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

                brelse(bp);
                return (NULL);
        }
        cgp->cg_time = time.tv_sec;
        if (ipref) {
                ipref %= fs->fs_ipg;
                brelse(bp);
                return (NULL);
        }
        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) {
                len = start + 1;
                start = 0;
        if (loc == 0) {
                len = start + 1;
                start = 0;

-               loc = skpc(0xff, len, &cgp->cg_iused[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);
                if (loc == 0) {
                        printf("cg = %s, irotor = %d, fs = %s\n",
                            cg, cgp->cg_irotor, fs->fs_fsmnt);

-                       panic("ialloccg: map corrupted");
+                       panic("ffs_ialloccg: map corrupted");

                        /* NOTREACHED */
                }
        }
        i = start + len - loc;
                        /* NOTREACHED */
                }
        }
        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) {


@@ -824,14 +871,14 @@ ialloccg(ip, cg, ipref, mode)
                }
        }
        printf("fs = %s\n", fs->fs_fsmnt);
                }
        }
        printf("fs = %s\n", fs->fs_fsmnt);

-       panic("ialloccg: block not in map");
+       panic("ffs_ialloccg: block not in map");

        /* NOTREACHED */
 gotit:
        /* 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--;

-       fs->fs_fmod++;
+       fs->fs_fmod = 1;

        if ((mode & IFMT) == IFDIR) {
                cgp->cg_cs.cs_ndir++;
                fs->fs_cstotal.cs_ndir++;
        if ((mode & IFMT) == IFDIR) {
                cgp->cg_cs.cs_ndir++;
                fs->fs_cstotal.cs_ndir++;


@@ -848,15 +895,15 @@ 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.
  */

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

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

-       off_t size;
+       long size;

 {
        register struct fs *fs;
        register struct cg *cgp;
 {
        register struct fs *fs;
        register struct cg *cgp;

-       register struct buf *bp;
-       int cg, blk, frags, bbase;
+       struct buf *bp;
+       int error, cg, blk, frags, bbase;

        register int i;
 
        fs = ip->i_fs;
        register int i;
 
        fs = ip->i_fs;


@@ -866,54 +913,55 @@ blkfree(ip, bno, size)
                panic("blkfree: bad size");
        }
        cg = dtog(fs, bno);
                panic("blkfree: bad size");
        }
        cg = dtog(fs, bno);

-       if (badblock(fs, bno)) {
+       if ((unsigned)bno >= fs->fs_size) {

                printf("bad block %d, ino %d\n", bno, ip->i_number);
                printf("bad block %d, ino %d\n", bno, ip->i_number);

+               ffs_fserr(fs, ip->i_uid, "bad block");
+               return;
+       }
+       error = bread(ip->i_devvp, fsbtodb(fs, cgtod(fs, cg)),
+               (int)fs->fs_cgsize, NOCRED, &bp);
+       if (error) {
+               brelse(bp);

                return;
        }
                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);
-#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 (!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 (ffs_isblock(fs, cg_blksfree(cgp), fragstoblks(fs, bno))) {

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

-               setblock(fs, cgp->cg_free, fragstoblks(fs, bno));
+               ffs_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);
-               fragacct(fs, blk, cgp->cg_frsum, -1);
+               blk = blkmap(fs, cg_blksfree(cgp), bbase);
+               ffs_fragacct(fs, blk, cgp->cg_frsum, -1);

                /*
                 * deallocate the fragment
                 */
                frags = numfrags(fs, size);
                for (i = 0; i < frags; i++) {
                /*
                 * 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);
                                panic("blkfree: freeing free frag");
                        }
                                printf("dev = 0x%x, block = %d, fs = %s\n",
                                    ip->i_dev, bno + i, fs->fs_fsmnt);
                                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;


@@ -921,12 +969,13 @@ blkfree(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);
-               fragacct(fs, blk, cgp->cg_frsum, 1);
+               blk = blkmap(fs, cg_blksfree(cgp), bbase);
+               ffs_fragacct(fs, blk, cgp->cg_frsum, 1);

                /*
                 * if a complete block has been reassembled, account for it
                 */
                /*
                 * if a complete block has been reassembled, account for it
                 */

-               if (isblock(fs, cgp->cg_free, fragstoblks(fs, bbase))) {
+               if (ffs_isblock(fs, cg_blksfree(cgp),
+                   (daddr_t)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;


@@ -934,11 +983,11 @@ blkfree(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 = 1;

        bdwrite(bp);
 }
 
        bdwrite(bp);
 }
 


@@ -947,54 +996,60 @@ blkfree(ip, bno, size)
  *
  * The specified inode is placed back in the free map.
  */
  *
  * The specified inode is placed back in the free map.
  */

-ifree(ip, ino, mode)
-       struct inode *ip;
-       ino_t ino;
-       int mode;
+int
+ffs_vfree(ap)
+       struct vop_vfree_args /* {
+               struct vnode *a_pvp;
+               ino_t a_ino;
+               int a_mode;
+       } */ *ap;

 {
        register struct fs *fs;
        register struct cg *cgp;
 {
        register struct fs *fs;
        register struct cg *cgp;

-       register struct buf *bp;
-       int cg;
+       register struct inode *pip;
+       ino_t ino = ap->a_ino;
+       struct buf *bp;
+       int error, cg;

 
 

-       fs = ip->i_fs;
-       if ((unsigned)ino >= fs->fs_ipg*fs->fs_ncg) {
-               printf("dev = 0x%x, ino = %d, fs = %s\n",
-                   ip->i_dev, ino, fs->fs_fsmnt);
-               panic("ifree: range");
-       }
+       pip = VTOI(ap->a_pvp);
+       fs = pip->i_fs;
+       if ((u_int)ino >= fs->fs_ipg * fs->fs_ncg)
+               panic("ifree: range: dev = 0x%x, ino = %d, fs = %s\n",
+                   pip->i_dev, ino, fs->fs_fsmnt);

        cg = itog(fs, ino);
        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);
-#endif SECSIZE
+       error = bread(pip->i_devvp, fsbtodb(fs, cgtod(fs, cg)),
+               (int)fs->fs_cgsize, NOCRED, &bp);
+       if (error) {
+               brelse(bp);
+               return (0);
+       }

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

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

                brelse(bp);
                brelse(bp);

-               return;
+               return (0);

        }
        cgp->cg_time = time.tv_sec;
        ino %= fs->fs_ipg;
        }
        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",
                printf("dev = 0x%x, ino = %d, fs = %s\n",

-                   ip->i_dev, ino, fs->fs_fsmnt);
-               panic("ifree: freeing free inode");
+                   pip->i_dev, ino, fs->fs_fsmnt);
+               if (fs->fs_ronly == 0)
+                       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++;
        fs->fs_cstotal.cs_nifree++;
        fs->fs_cs(fs, cg).cs_nifree++;
        if (ino < cgp->cg_irotor)
                cgp->cg_irotor = ino;
        cgp->cg_cs.cs_nifree++;
        fs->fs_cstotal.cs_nifree++;
        fs->fs_cs(fs, cg).cs_nifree++;

-       if ((mode & IFMT) == IFDIR) {
+       if ((ap->a_mode & IFMT) == IFDIR) {

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

-       fs->fs_fmod++;
+       fs->fs_fmod = 1;

        bdwrite(bp);
        bdwrite(bp);

+       return (0);

 }
 
 /*
 }
 
 /*


@@ -1003,8 +1058,8 @@ ifree(ip, ino, mode)
  * It is a panic if a request is made to find a block if none are
  * available.
  */
  * It is a panic if a request is made to find a block if none are
  * available.
  */

-daddr_t
-mapsearch(fs, cgp, bpref, allocsiz)
+static daddr_t
+ffs_mapsearch(fs, cgp, bpref, allocsiz)

        register struct fs *fs;
        register struct cg *cgp;
        daddr_t bpref;
        register struct fs *fs;
        register struct cg *cgp;
        daddr_t bpref;


@@ -1023,19 +1078,19 @@ 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],
-               (caddr_t)fragtbl[fs->fs_frag],
-               (int)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY))));
+       loc = scanc((unsigned)len, (u_char *)&cg_blksfree(cgp)[start],
+               (u_char *)fragtbl[fs->fs_frag],
+               (u_char)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY))));

        if (loc == 0) {
                len = start + 1;
                start = 0;
        if (loc == 0) {
                len = start + 1;
                start = 0;

-               loc = scanc((unsigned)len, (caddr_t)&cgp->cg_free[0],
-                       (caddr_t)fragtbl[fs->fs_frag],
-                       (int)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY))));
+               loc = scanc((unsigned)len, (u_char *)&cg_blksfree(cgp)[0],
+                       (u_char *)fragtbl[fs->fs_frag],
+                       (u_char)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY))));

                if (loc == 0) {
                        printf("start = %d, len = %d, fs = %s\n",
                            start, len, fs->fs_fsmnt);
                if (loc == 0) {
                        printf("start = %d, len = %d, fs = %s\n",
                            start, len, fs->fs_fsmnt);

-                       panic("alloccg: map corrupted");
+                       panic("ffs_alloccg: map corrupted");

                        /* NOTREACHED */
                }
        }
                        /* NOTREACHED */
                }
        }


@@ -1046,7 +1101,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];


@@ -1058,7 +1113,7 @@ mapsearch(fs, cgp, bpref, allocsiz)
                }
        }
        printf("bno = %d, fs = %s\n", bno, fs->fs_fsmnt);
                }
        }
        printf("bno = %d, fs = %s\n", bno, fs->fs_fsmnt);

-       panic("alloccg: block not in map");
+       panic("ffs_alloccg: block not in map");

        return (-1);
 }
 
        return (-1);
 }
 


@@ -1068,10 +1123,12 @@ mapsearch(fs, cgp, bpref, allocsiz)
  * The form of the error message is:
  *     fs: error message
  */
  * The form of the error message is:
  *     fs: error message
  */

-fserr(fs, cp)
+static void
+ffs_fserr(fs, uid, cp)

        struct fs *fs;
        struct fs *fs;

+       u_int uid;

        char *cp;
 {
 
        char *cp;
 {
 

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

 }
 }