cleanups and bug fixes from John

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

diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c
index e30deff..df2c16e 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_inode.c
+++ b/usr/src/sys/ufs/ffs/ffs_inode.c
@@ -2,522 +2,193 @@
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)ffs_inode.c 7.7 (Berkeley) %G%
+ *     @(#)ffs_inode.c 7.45 (Berkeley) %G%

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "mount.h"
-#include "user.h"
-#include "file.h"
-#include "buf.h"
-#include "cmap.h"
-#include "vnode.h"
-#include "../ufs/inode.h"
-#include "../ufs/fs.h"
-#include "../ufs/ufsmount.h"
-#ifdef QUOTA
-#include "../ufs/quota.h"
-#endif
-#include "kernel.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/mount.h>
+#include <sys/proc.h>
+#include <sys/file.h>
+#include <sys/buf.h>
+#include <sys/vnode.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>

 
 

-#define        INOHSZ  512
-#if    ((INOHSZ&(INOHSZ-1)) == 0)
-#define        INOHASH(dev,ino)        (((dev)+(ino))&(INOHSZ-1))
-#else
-#define        INOHASH(dev,ino)        (((unsigned)((dev)+(ino)))%INOHSZ)
-#endif
+#include <ufs/ufs/quota.h>
+#include <ufs/ufs/inode.h>
+#include <ufs/ufs/ufsmount.h>
+#include <ufs/ufs/ufs_extern.h>

 
 

-#define INSFREE(ip) {\
-       if (ifreeh) { \
-               *ifreet = (ip); \
-               (ip)->i_freeb = ifreet; \
-       } else { \
-               ifreeh = (ip); \
-               (ip)->i_freeb = &ifreeh; \
-       } \
-       (ip)->i_freef = NULL; \
-       ifreet = &(ip)->i_freef; \
-}
+#include <ufs/ffs/fs.h>
+#include <ufs/ffs/ffs_extern.h>

 
 

-union ihead {                          /* inode LRU cache, Chris Maltby */
-       union  ihead *ih_head[2];
-       struct inode *ih_chain[2];
-} ihead[INOHSZ];
+static int ffs_indirtrunc __P((struct inode *, daddr_t, daddr_t, int, long *));

 
 

-struct inode *ifreeh, **ifreet, *bdevlisth;
+extern u_long nextgennumber;

 
 

-/*
- * Initialize hash links for inodes
- * and build inode free list.
- */
-ihinit()
+int
+ffs_init()

 {
 {

-       register int i;
-       register struct inode *ip = inode;
-       register union  ihead *ih = ihead;
-
-       for (i = INOHSZ; --i >= 0; ih++) {
-               ih->ih_head[0] = ih;
-               ih->ih_head[1] = ih;
-       }
-       ifreeh = ip;
-       ifreet = &ip->i_freef;
-       ip->i_freeb = &ifreeh;
-       ip->i_forw = ip;
-       ip->i_back = ip;
-       ITOV(ip)->v_data = (qaddr_t)ip;
-       for (i = ninode; --i > 0; ) {
-               ++ip;
-               ip->i_forw = ip;
-               ip->i_back = ip;
-               ITOV(ip)->v_data = (qaddr_t)ip;
-               *ifreet = ip;
-               ip->i_freeb = ifreet;
-               ifreet = &ip->i_freef;
-       }
-       ip->i_freef = NULL;
+       return (ufs_init());

 }
 
 /*
 }
 
 /*

- * Look up an vnode/inode by device,inumber.
- * If it is in core (in the inode structure),
- * honor the locking protocol.
- * If it is not in core, read it in from the
- * specified device.
- * Callers must check for mount points!!
- * In all cases, a pointer to a locked
- * inode structure is returned.
+ * Look up a UFS dinode number to find its incore vnode.
+ * If it is not in core, read it in from the specified device.
+ * If it is in core, wait for the lock bit to clear, then
+ * return the inode locked. Detection and handling of mount
+ * points must be done by the calling routine.

  */
  */

-iget(xp, ino, ipp)
-       struct inode *xp;
+ffs_vget(mntp, ino, vpp)
+       struct mount *mntp;

        ino_t ino;
        ino_t ino;

-       struct inode **ipp;
+       struct vnode **vpp;

 {
 {

-       dev_t dev = xp->i_dev;
-       struct mount *mntp = ITOV(xp)->v_mount;
-       register struct fs *fs = VFSTOUFS(mntp)->um_fs;
-       register struct inode *ip, *iq;
-       register struct vnode *vp;
-       struct inode *nip;
+       register struct fs *fs;
+       register struct inode *ip;
+       struct ufsmount *ump;

        struct buf *bp;
        struct buf *bp;

-       struct dinode tdip, *dp;
-       union  ihead *ih;
-       int error;
+       struct dinode *dp;
+       struct vnode *vp;
+       union ihead *ih;
+       dev_t dev;
+       int i, type, error;

 
 

-loop:
-       ih = &ihead[INOHASH(dev, ino)];
-       for (ip = ih->ih_chain[0]; ip != (struct inode *)ih; ip = ip->i_forw)
-               if (ino == ip->i_number && dev == ip->i_dev) {
-                       /*
-                        * Following is essentially an inline expanded
-                        * copy of igrab(), expanded inline for speed,
-                        * and so that the test for a mounted on inode
-                        * can be deferred until after we are sure that
-                        * the inode isn't busy.
-                        */
-                       if ((ip->i_flag&ILOCKED) != 0) {
-                               ip->i_flag |= IWANT;
-                               sleep((caddr_t)ip, PINOD);
-                               goto loop;
-                       }
-                       vp = ITOV(ip);
-                       if (vp->v_count == 0) {         /* ino on free list */
-                               if (iq = ip->i_freef)
-                                       iq->i_freeb = ip->i_freeb;
-                               else
-                                       ifreet = ip->i_freeb;
-                               *ip->i_freeb = iq;
-                               ip->i_freef = NULL;
-                               ip->i_freeb = NULL;
-                       }
-                       ILOCK(ip);
-                       vp->v_count++;
-                       *ipp = ip;
-                       return(0);
-               }
-       if (error = getnewino(dev, ino, &nip)) {
-               *ipp = 0;
+       ump = VFSTOUFS(mntp);
+       dev = ump->um_dev;
+       if ((*vpp = ufs_ihashget(dev, ino)) != NULL)
+               return (0);
+
+       /* Allocate a new vnode/inode. */
+       if (error = getnewvnode(VT_UFS, mntp, &ffs_vnodeops, &vp)) {
+               *vpp = NULL;

                return (error);
        }
                return (error);
        }

-       ip = nip;
+       type = ump->um_devvp->v_tag == VT_MFS ? M_MFSNODE : M_FFSNODE; /* XXX */
+       MALLOC(ip, struct inode *, sizeof(struct inode), type, M_WAITOK);
+       vp->v_data = ip;
+       ip->i_vnode = vp;
+       ip->i_flag = 0;
+       ip->i_devvp = 0;
+       ip->i_mode = 0;
+       ip->i_diroff = 0;
+       ip->i_lockf = 0;
+       ip->i_fs = fs = ump->um_fs;
+       ip->i_dev = dev;
+       ip->i_number = ino;
+#ifdef QUOTA
+       for (i = 0; i < MAXQUOTAS; i++)
+               ip->i_dquot[i] = NODQUOT;
+#endif

        /*
        /*

-        * Read in the disk contents for the inode.
+        * Put it onto its hash chain and lock it so that other requests for
+        * this inode will block if they arrive while we are sleeping waiting
+        * for old data structures to be purged or for the contents of the
+        * disk portion of this inode to be read.

         */
         */

-       if (error = bread(VFSTOUFS(mntp)->um_devvp, fsbtodb(fs, itod(fs, ino)),
-           (int)fs->fs_bsize, &bp)) {
+       ufs_ihashins(ip);
+
+       /* Read in the disk contents for the inode, copy into the inode. */
+       if (error = bread(ump->um_devvp, fsbtodb(fs, itod(fs, ino)),
+           (int)fs->fs_bsize, NOCRED, &bp)) {

                /*
                /*

-                * The inode doesn't contain anything useful, so it would
-                * be misleading to leave it on its hash chain. Iput() will
-                * take care of putting it back on the free list. We also
-                * lose its inumber, just in case.
+                * The inode does not contain anything useful, so it would
+                * be misleading to leave it on its hash chain. It will be
+                * returned to the free list by ufs_iput().

                 */
                remque(ip);
                ip->i_forw = ip;
                ip->i_back = ip;
                 */
                remque(ip);
                ip->i_forw = ip;
                ip->i_back = ip;

-               ip->i_number = 0;
-               INSFREE(ip);
-               iunlock(ip);
-               ip->i_flag = 0;
+
+               /* Unlock and discard unneeded inode. */
+               ufs_iput(ip);

                brelse(bp);
                brelse(bp);

-               *ipp = 0;
-               return(error);
+               *vpp = NULL;
+               return (error);

        }
        }

-       /*
-        * Check to see if the new inode represents a block device
-        * for which we already have an inode (either because of
-        * bdevvp() or because of a different inode representing
-        * the same block device). If such an alias exists, put the
-        * just allocated inode back on the free list, and replace
-        * the contents of the existing inode with the contents of
-        * the new inode.
-        */

        dp = bp->b_un.b_dino;
        dp += itoo(fs, ino);
        dp = bp->b_un.b_dino;
        dp += itoo(fs, ino);

-       if ((dp->di_mode & IFMT) != IFBLK) {
-               ip->i_ic = dp->di_ic;
-               brelse(bp);
-       } else {
-again:
-               for (iq = bdevlisth; iq; iq = iq->i_devlst) {
-                       if (dp->di_rdev != ITOV(iq)->v_rdev)
-                               continue;
-                       igrab(iq);
-                       if (dp->di_rdev != ITOV(iq)->v_rdev) {
-                               iput(iq);
-                               goto again;
-                       }
-                       /*
-                        * Discard unneeded inode.
-                        */
-                       remque(ip);
-                       ip->i_forw = ip;
-                       ip->i_back = ip;
-                       ip->i_number = 0;
-                       INSFREE(ip);
-                       iunlock(ip);
-                       ip->i_flag = 0;
-                       /*
-                        * Reinitialize aliased inode.
-                        * We must release the buffer that we just read
-                        * before doing the iupdat() to avoid a possible
-                        * deadlock with updating an inode in the same
-                        * disk block.
-                        */
-                       ip = iq;
-                       vp = ITOV(iq);
-                       tdip.di_ic = dp->di_ic;
-                       brelse(bp);
-                       error = iupdat(ip, &time, &time, 1);
-                       ip->i_ic = tdip.di_ic;
-                       remque(ip);
-                       insque(ip, ih);
-                       ip->i_dev = dev;
-                       ip->i_number = ino;
-                       if (ip->i_devvp) {
-                               vrele(ip->i_devvp);
-                               ip->i_devvp = 0;
-                       }
-                       cache_purge(vp);
-                       break;
-               }
-               if (iq == 0) {
-                       ip->i_ic = dp->di_ic;
-                       brelse(bp);
-                       ip->i_devlst = bdevlisth;
-                       bdevlisth = ip;
-               }
-       }
-       /*
-        * Finish inode initialization.
-        */
-       ip->i_fs = fs;
-       ip->i_devvp = VFSTOUFS(mntp)->um_devvp;
-       ip->i_devvp->v_count++;
-       /*
-        * Initialize the associated vnode
-        */
-       vp = ITOV(ip);
-       vinit(vp, mntp, IFTOVT(ip->i_mode), &ufs_vnodeops);
-       if (vp->v_type == VCHR || vp->v_type == VBLK) {
-               vp->v_rdev = ip->i_rdev;
-               vp->v_op = &blk_vnodeops;
-       }
-       if (ino == ROOTINO)
-               vp->v_flag |= VROOT;
-#ifdef QUOTA
-       if (ip->i_mode != 0)
-               ip->i_dquot = inoquota(ip);
-#endif
-       *ipp = ip;
-       return (0);
-}
-
-/*
- * Allocate a new inode.
- *
- * Put it onto its hash chain and lock it so that other requests for
- * this inode will block if they arrive while we are sleeping waiting
- * for old data structures to be purged or for the contents of the disk
- * portion of this inode to be read.
- */
-getnewino(dev, ino, ipp)
-       dev_t dev;
-       ino_t ino;
-       struct inode **ipp;
-{
-       union ihead *ih;
-       register struct inode *ip, *iq;
-       register struct vnode *vp;
+       ip->i_din = *dp;
+       brelse(bp);

 
        /*
 
        /*

-        * Remove the next inode from the free list.
+        * Initialize the vnode from the inode, check for aliases.
+        * Note that the underlying vnode may have changed.

         */
         */

-       if ((ip = ifreeh) == NULL) {
-               tablefull("inode");
-               *ipp = 0;
-               return(ENFILE);
-       }
-       vp = ITOV(ip);
-       if (vp->v_count)
-               panic("free inode isn't");
-       if (iq = ip->i_freef)
-               iq->i_freeb = &ifreeh;
-       ifreeh = iq;
-       ip->i_freef = NULL;
-       ip->i_freeb = NULL;
-       /*
-        * Now to take inode off the hash chain it was on
-        * (initially, or after an iflush, it is on a "hash chain"
-        * consisting entirely of itself, and pointed to by no-one)
-        * and put it on the chain for its new (ino, dev) pair.
-        */
-       remque(ip);
-       ip->i_dev = dev;
-       ip->i_number = ino;
-       if (dev != NODEV) {
-               ih = &ihead[INOHASH(dev, ino)];
-               insque(ip, ih);
+       if (error = ufs_vinit(mntp, &ffs_specops, FFS_FIFOOPS, &vp)) {
+               ufs_iput(ip);
+               *vpp = NULL;
+               return (error);

        }
        }

-       ip->i_flag = 0;
-       ILOCK(ip);
-       ip->i_lastr = 0;
-#endif SECSIZE

        /*
        /*

-        * Purge old data structures associated with the inode.
+        * Finish inode initialization now that aliasing has been resolved.

         */
         */

-       cache_purge(vp);
-       if (ip->i_devvp) {
-               vrele(ip->i_devvp);
-               ip->i_devvp = 0;
-       }
-#ifdef QUOTA
-       dqrele(ip->i_dquot);
-       ip->i_dquot = NODQUOT;
-#endif
-       if (vp->v_type == VBLK) {
-               if (bdevlisth == ip) {
-                       bdevlisth = ip->i_devlst;
-               } else {
-                       for (iq = bdevlisth; iq; iq = iq->i_devlst) {
-                               if (iq->i_devlst != ip)
-                                       continue;
-                               iq->i_devlst = ip->i_devlst;
-                               break;
-                       }
-                       if (iq == NULL)
-                               panic("missing bdev");
-               }
-       }
-       *ipp = ip;
-       return (0);
-}
-
-/*
- * Convert a pointer to an inode into a reference to an inode.
- *
- * This is basically the internal piece of iget (after the
- * inode pointer is located) but without the test for mounted
- * filesystems.  It is caller's responsibility to check that
- * the inode pointer is valid.
- */
-igrab(ip)
-       register struct inode *ip;
-{
-       register struct vnode *vp = ITOV(ip);
-
-       while ((ip->i_flag&ILOCKED) != 0) {
-               ip->i_flag |= IWANT;
-               sleep((caddr_t)ip, PINOD);
-       }
-       if (vp->v_count == 0) {         /* ino on free list */
-               register struct inode *iq;
-
-               if (iq = ip->i_freef)
-                       iq->i_freeb = ip->i_freeb;
-               else
-                       ifreet = ip->i_freeb;
-               *ip->i_freeb = iq;
-               ip->i_freef = NULL;
-               ip->i_freeb = NULL;
-       }
-       vp->v_count++;
-       ILOCK(ip);
-}
-
-/*
- * Create a vnode for a block device.
- * Used for root filesystem, argdev, and swap areas.
- */
-bdevvp(dev, vpp)
-       dev_t dev;
-       struct vnode **vpp;
-{
-       register struct inode *ip;
-       register struct vnode *vp;
-       struct inode *nip;
-       int error;
-
+       ip->i_devvp = ump->um_devvp;
+       VREF(ip->i_devvp);

        /*
        /*

-        * Check for the existence of an existing vnode.
+        * Set up a generation number for this inode if it does not
+        * already have one. This should only happen on old filesystems.

         */
         */

-again:
-       for (ip = bdevlisth; ip; ip = ip->i_devlst) {
-               vp = ITOV(ip);
-               if (dev != vp->v_rdev)
-                       continue;
-               igrab(ip);
-               if (dev != vp->v_rdev) {
-                       iput(ip);
-                       goto again;
-               }
-               IUNLOCK(ip);
-               *vpp = vp;
-               return (0);
+       if (ip->i_gen == 0) {
+               if (++nextgennumber < (u_long)time.tv_sec)
+                       nextgennumber = time.tv_sec;
+               ip->i_gen = nextgennumber;
+               if ((vp->v_mount->mnt_flag & MNT_RDONLY) == 0)
+                       ip->i_flag |= IMOD;

        }
        }

-       if (error = getnewino(NODEV, (ino_t)0, &nip)) {
-               *vpp = 0;
-               return (error);
-       }
-       ip = nip;
-       ip->i_fs = 0;
-       ip->i_devlst = bdevlisth;
-       bdevlisth = ip;
-       vp = ITOV(ip);
-       vinit(vp, 0, VBLK, &blk_vnodeops);
-       vp->v_rdev = dev;
-       IUNLOCK(ip);

        *vpp = vp;
        return (0);
 }
 
 /*
        *vpp = vp;
        return (0);
 }
 
 /*

- * Decrement reference count of
- * an inode structure.
- * On the last reference,
- * write the inode out and if necessary,
- * truncate and deallocate the file.
- */
-iput(ip)
-       register struct inode *ip;
-{
-
-       if ((ip->i_flag & ILOCKED) == 0)
-               panic("iput");
-       IUNLOCK(ip);
-       vrele(ITOV(ip));
-}
-
-
-ufs_inactive(vp)
-       struct vnode *vp;
-{
-       register struct inode *ip = VTOI(vp);
-       int mode, error;
-
-       if (ITOV(ip)->v_count != 0)
-               panic("ufs_inactive: not inactive");
-       ILOCK(ip);
-       if (ip->i_nlink <= 0 && (ITOV(ip)->v_mount->m_flag&M_RDONLY) == 0) {
-               error = itrunc(ip, (u_long)0);
-               mode = ip->i_mode;
-               ip->i_mode = 0;
-               ip->i_rdev = 0;
-               ip->i_flag |= IUPD|ICHG;
-               ifree(ip, ip->i_number, mode);
-#ifdef QUOTA
-               (void) chkiq(ip->i_dev, ip, ip->i_uid, 0);
-               dqrele(ip->i_dquot);
-               ip->i_dquot = NODQUOT;
-#endif
-       }
-       IUPDAT(ip, &time, &time, 0);
-       IUNLOCK(ip);
-       ip->i_flag = 0;
-       /*
-        * Put the inode on the end of the free list.
-        * Possibly in some cases it would be better to
-        * put the inode at the head of the free list,
-        * (eg: where i_mode == 0 || i_number == 0).
-        */
-       INSFREE(ip);
-       return (error);
-}
-
-/*
- * Check accessed and update flags on
- * an inode structure.
- * If any is on, update the inode
- * with the current time.
- * If waitfor is given, then must insure
- * i/o order so wait for write to complete.
+ * Update the access, modified, and inode change times as specified
+ * by the IACC, IUPD, and ICHG flags respectively. The IMOD flag
+ * is used to specify that the inode needs to be updated but that
+ * the times have already been set. The access and modified times
+ * are taken from the second and third parameters; the inode change
+ * time is always taken from the current time. If waitfor is set,
+ * then wait for the disk write of the inode to complete.

  */
  */

-iupdat(ip, ta, tm, waitfor)
-       register struct inode *ip;
+int
+ffs_update(vp, ta, tm, waitfor)
+       register struct vnode *vp;

        struct timeval *ta, *tm;
        int waitfor;
 {
        struct buf *bp;
        struct timeval *ta, *tm;
        int waitfor;
 {
        struct buf *bp;

-       struct vnode *vp = ITOV(ip);
+       struct inode *ip;

        struct dinode *dp;
        register struct fs *fs;
 
        struct dinode *dp;
        register struct fs *fs;
 

-       fs = ip->i_fs;
-       if ((ip->i_flag & (IUPD|IACC|ICHG|IMOD)) == 0)
+       if (vp->v_mount->mnt_flag & MNT_RDONLY)

                return (0);
                return (0);

-       if (vp->v_mount->m_flag & M_RDONLY)
+       ip = VTOI(vp);
+       if ((ip->i_flag & (IUPD|IACC|ICHG|IMOD)) == 0)

                return (0);
                return (0);

-       error = bread(ip->i_devvp, fsbtodb(fs, itod(fs, ip->i_number)),
-               (int)fs->fs_bsize, &bp);
-       if (error) {
-               brelse(bp);
-               return (error);
-       }

        if (ip->i_flag&IACC)
                ip->i_atime = ta->tv_sec;
        if (ip->i_flag&IACC)
                ip->i_atime = ta->tv_sec;

-       if (ip->i_flag&IUPD)
+       if (ip->i_flag&IUPD) {

                ip->i_mtime = tm->tv_sec;
                ip->i_mtime = tm->tv_sec;

+               INCRQUAD(ip->i_modrev);
+       }

        if (ip->i_flag&ICHG)
                ip->i_ctime = time.tv_sec;
        ip->i_flag &= ~(IUPD|IACC|ICHG|IMOD);
        if (ip->i_flag&ICHG)
                ip->i_ctime = time.tv_sec;
        ip->i_flag &= ~(IUPD|IACC|ICHG|IMOD);

+
+       fs = ip->i_fs;
+       if (error = bread(ip->i_devvp, fsbtodb(fs, itod(fs, ip->i_number)),
+               (int)fs->fs_bsize, NOCRED, &bp)) {
+               brelse(bp);
+               return (error);
+       }

        dp = bp->b_un.b_dino + itoo(fs, ip->i_number);
        dp = bp->b_un.b_dino + itoo(fs, ip->i_number);

-       dp->di_ic = ip->i_ic;
-       if (waitfor) {
+       *dp = ip->i_din;
+       if (waitfor)

                return (bwrite(bp));
                return (bwrite(bp));

-       } else {
+       else {

                bdwrite(bp);
                return (0);
        }
                bdwrite(bp);
                return (0);
        }


@@ -527,18 +198,18 @@ iupdat(ip, ta, tm, waitfor)
 #define        DOUBLE  1       /* index of double indirect block */
 #define        TRIPLE  2       /* index of triple indirect block */
 /*
 #define        DOUBLE  1       /* index of double indirect block */
 #define        TRIPLE  2       /* index of triple indirect block */
 /*

- * Truncate the inode ip to at most
- * length size.  Free affected disk
- * blocks -- the blocks of the file
- * are removed in reverse order.
+ * Truncate the inode ip to at most length size.  Free affected disk
+ * blocks -- the blocks of the file are removed in reverse order.

  *
  * NB: triple indirect blocks are untested.
  */
  *
  * NB: triple indirect blocks are untested.
  */

-itrunc(oip, length)
-       register struct inode *oip;
+ffs_truncate(ovp, length, flags)
+       register struct vnode *ovp;

        u_long length;
        u_long length;

+       int flags;

 {
        register daddr_t lastblock;
 {
        register daddr_t lastblock;

+       register struct inode *oip;

        daddr_t bn, lbn, lastiblock[NIADDR];
        register struct fs *fs;
        register struct inode *ip;
        daddr_t bn, lbn, lastiblock[NIADDR];
        register struct fs *fs;
        register struct inode *ip;


@@ -546,12 +217,14 @@ itrunc(oip, length)
        int offset, osize, size, level;
        long count, nblocks, blocksreleased = 0;
        register int i;
        int offset, osize, size, level;
        long count, nblocks, blocksreleased = 0;
        register int i;

-       int error, allerror = 0;
+       int aflags, error, allerror;

        struct inode tip;
 
        struct inode tip;
 

+       vnode_pager_setsize(ovp, length);
+       oip = VTOI(ovp);

        if (oip->i_size <= length) {
                oip->i_flag |= ICHG|IUPD;
        if (oip->i_size <= length) {
                oip->i_flag |= ICHG|IUPD;

-               error = iupdat(oip, &time, &time, 1);
+               error = ffs_update(ovp, &time, &time, 1);

                return (error);
        }
        /*
                return (error);
        }
        /*


@@ -579,31 +252,30 @@ itrunc(oip, length)
                oip->i_size = length;
        } else {
                lbn = lblkno(fs, length);
                oip->i_size = length;
        } else {
                lbn = lblkno(fs, length);

-               error = balloc(oip, lbn, offset, &bn, B_CLRBUF);
-               if (error)
+               aflags = B_CLRBUF;
+               if (flags & IO_SYNC)
+                       aflags |= B_SYNC;
+#ifdef QUOTA
+               if (error = getinoquota(oip))
+                       return (error);
+#endif
+               if (error = ffs_balloc(oip, lbn, offset, &bp, aflags))

                        return (error);
                        return (error);

-               if ((long)bn < 0)
-                       panic("itrunc: hole");

                oip->i_size = length;
                size = blksize(fs, oip, lbn);
                oip->i_size = length;
                size = blksize(fs, oip, lbn);

-               count = howmany(size, CLBYTES);
-                       munhash(oip->i_devvp, bn + i * CLBYTES / DEV_BSIZE);
-               error = bread(oip->i_devvp, bn, size, &bp);
-               if (error) {
-                       oip->i_size = osize;
-                       brelse(bp);
-                       return (error);
-               }
+               (void) vnode_pager_uncache(ITOV(oip));

                bzero(bp->b_un.b_addr + offset, (unsigned)(size - offset));
                bzero(bp->b_un.b_addr + offset, (unsigned)(size - offset));

-               bdwrite(bp);
+               allocbuf(bp, size);
+               if (flags & IO_SYNC)
+                       bwrite(bp);
+               else
+                       bdwrite(bp);

        }
        /*
        }
        /*

-        * Update file and block pointers
-        * on disk before we start freeing blocks.
-        * If we crash before free'ing blocks below,
-        * the blocks will be returned to the free list.
-        * lastiblock values are also normalized to -1
-        * for calls to indirtrunc below.
+        * Update file and block pointers on disk before we start freeing
+        * blocks.  If we crash before free'ing blocks below, the blocks
+        * will be returned to the free list.  lastiblock values are also
+        * normalized to -1 for calls to ffs_indirtrunc below.

         */
        tip = *oip;
        tip.i_size = osize;
         */
        tip = *oip;
        tip.i_size = osize;


@@ -615,7 +287,8 @@ itrunc(oip, length)
        for (i = NDADDR - 1; i > lastblock; i--)
                oip->i_db[i] = 0;
        oip->i_flag |= ICHG|IUPD;
        for (i = NDADDR - 1; i > lastblock; i--)
                oip->i_db[i] = 0;
        oip->i_flag |= ICHG|IUPD;

-       allerror = syncip(oip);
+       vinvalbuf(ITOV(oip), (length > 0));
+       allerror = ffs_update(ovp, &time, &time, MNT_WAIT);

 
        /*
         * Indirect blocks first.
 
        /*
         * Indirect blocks first.


@@ -624,14 +297,14 @@ itrunc(oip, length)
        for (level = TRIPLE; level >= SINGLE; level--) {
                bn = ip->i_ib[level];
                if (bn != 0) {
        for (level = TRIPLE; level >= SINGLE; level--) {
                bn = ip->i_ib[level];
                if (bn != 0) {

-                       error = indirtrunc(ip, bn, lastiblock[level], level,
-                               &count);
+                       error = ffs_indirtrunc(ip,
+                           bn, lastiblock[level], level, &count);

                        if (error)
                                allerror = error;
                        blocksreleased += count;
                        if (lastiblock[level] < 0) {
                                ip->i_ib[level] = 0;
                        if (error)
                                allerror = error;
                        blocksreleased += count;
                        if (lastiblock[level] < 0) {
                                ip->i_ib[level] = 0;

-                               blkfree(ip, bn, (off_t)fs->fs_bsize);
+                               ffs_blkfree(ip, bn, (off_t)fs->fs_bsize);

                                blocksreleased += nblocks;
                        }
                }
                                blocksreleased += nblocks;
                        }
                }


@@ -650,7 +323,7 @@ itrunc(oip, length)
                        continue;
                ip->i_db[i] = 0;
                bsize = (off_t)blksize(fs, ip, i);
                        continue;
                ip->i_db[i] = 0;
                bsize = (off_t)blksize(fs, ip, i);

-               blkfree(ip, bn, bsize);
+               ffs_blkfree(ip, bn, bsize);

                blocksreleased += btodb(bsize);
        }
        if (lastblock < 0)
                blocksreleased += btodb(bsize);
        }
        if (lastblock < 0)


@@ -680,7 +353,7 @@ itrunc(oip, length)
                         * required for the storage we're keeping.
                         */
                        bn += numfrags(fs, newspace);
                         * required for the storage we're keeping.
                         */
                        bn += numfrags(fs, newspace);

-                       blkfree(ip, bn, oldspace - newspace);
+                       ffs_blkfree(ip, bn, oldspace - newspace);

                        blocksreleased += btodb(oldspace - newspace);
                }
        }
                        blocksreleased += btodb(oldspace - newspace);
                }
        }


@@ -698,22 +371,23 @@ done:
                oip->i_blocks = 0;
        oip->i_flag |= ICHG;
 #ifdef QUOTA
                oip->i_blocks = 0;
        oip->i_flag |= ICHG;
 #ifdef QUOTA

-       (void) chkdq(oip, -blocksreleased, 0);
+       if (!getinoquota(oip))
+               (void) chkdq(oip, -blocksreleased, NOCRED, 0);

 #endif
        return (allerror);
 }
 
 /*
 #endif
        return (allerror);
 }
 
 /*

- * Release blocks associated with the inode ip and
- * stored in the indirect block bn.  Blocks are free'd
- * in LIFO order up to (but not including) lastbn.  If
- * level is greater than SINGLE, the block is an indirect
- * block and recursive calls to indirtrunc must be used to
- * cleanse other indirect blocks.
+ * Release blocks associated with the inode ip and stored in the indirect
+ * block bn.  Blocks are free'd in LIFO order up to (but not including)
+ * lastbn.  If level is greater than SINGLE, the block is an indirect block
+ * and recursive calls to indirtrunc must be used to cleanse other indirect
+ * blocks.

  *
  * NB: triple indirect blocks are untested.
  */
  *
  * NB: triple indirect blocks are untested.
  */

-indirtrunc(ip, bn, lastbn, level, countp)
+static int
+ffs_indirtrunc(ip, bn, lastbn, level, countp)

        register struct inode *ip;
        daddr_t bn, lastbn;
        int level;
        register struct inode *ip;
        daddr_t bn, lastbn;
        int level;


@@ -749,7 +423,8 @@ indirtrunc(ip, bn, lastbn, level, countp)
        bp = bread(ip->i_dev, fsbtodb(fs, bn), (int)fs->fs_bsize,
            fs->fs_dbsize);
 #else SECSIZE
        bp = bread(ip->i_dev, fsbtodb(fs, bn), (int)fs->fs_bsize,
            fs->fs_dbsize);
 #else SECSIZE

-       error = bread(ip->i_devvp, fsbtodb(fs, bn), (int)fs->fs_bsize, &bp);
+       error = bread(ip->i_devvp, fsbtodb(fs, bn), (int)fs->fs_bsize,
+               NOCRED, &bp);

        if (error) {
                brelse(bp);
                *countp = 0;
        if (error) {
                brelse(bp);
                *countp = 0;


@@ -760,6 +435,8 @@ indirtrunc(ip, bn, lastbn, level, countp)
        bcopy((caddr_t)bap, (caddr_t)copy, (u_int)fs->fs_bsize);
        bzero((caddr_t)&bap[last + 1],
          (u_int)(NINDIR(fs) - (last + 1)) * sizeof (daddr_t));
        bcopy((caddr_t)bap, (caddr_t)copy, (u_int)fs->fs_bsize);
        bzero((caddr_t)&bap[last + 1],
          (u_int)(NINDIR(fs) - (last + 1)) * sizeof (daddr_t));

+       if (last == -1)
+               bp->b_flags |= B_INVAL;

        error = bwrite(bp);
        if (error)
                allerror = error;
        error = bwrite(bp);
        if (error)
                allerror = error;


@@ -773,13 +450,12 @@ indirtrunc(ip, bn, lastbn, level, countp)
                if (nb == 0)
                        continue;
                if (level > SINGLE) {
                if (nb == 0)
                        continue;
                if (level > SINGLE) {

-                       error = indirtrunc(ip, nb, (daddr_t)-1, level - 1,
-                               &blkcount);
-                       if (error)
+                       if (error = ffs_indirtrunc(ip,
+                           nb, (daddr_t)-1, level - 1, &blkcount))

                                allerror = error;
                        blocksreleased += blkcount;
                }
                                allerror = error;
                        blocksreleased += blkcount;
                }

-               blkfree(ip, nb, (off_t)fs->fs_bsize);
+               ffs_blkfree(ip, nb, (off_t)fs->fs_bsize);

                blocksreleased += nblocks;
        }
 
                blocksreleased += nblocks;
        }
 


@@ -790,8 +466,8 @@ indirtrunc(ip, bn, lastbn, level, countp)
                last = lastbn % factor;
                nb = bap[i];
                if (nb != 0) {
                last = lastbn % factor;
                nb = bap[i];
                if (nb != 0) {

-                       error = indirtrunc(ip, nb, last, level - 1, &blkcount);
-                       if (error)
+                       if (error =
+                           ffs_indirtrunc(ip, nb, last, level - 1, &blkcount))

                                allerror = error;
                        blocksreleased += blkcount;
                }
                                allerror = error;
                        blocksreleased += blkcount;
                }


@@ -800,128 +476,3 @@ indirtrunc(ip, bn, lastbn, level, countp)
        *countp = blocksreleased;
        return (allerror);
 }
        *countp = blocksreleased;
        return (allerror);
 }

-
-/*
- * Remove any inodes in the inode cache belonging to dev.
- *
- * There should not be any active ones, return error if any are found
- * (nb: this is a user error, not a system err).
- */
-#ifdef QUOTA
-iflush(dev, iq)
-       dev_t dev;
-       struct inode *iq;
-#else
-iflush(dev)
-       dev_t dev;
-#endif
-{
-       register struct inode *ip;
-
-       for (ip = inode; ip < inodeNINODE; ip++) {
-#ifdef QUOTA
-               if (ip != iq && ip->i_dev == dev)
-#else
-               if (ip->i_dev == dev)
-#endif
-                       if (ITOV(ip)->v_count)
-                               return (EBUSY);
-                       else {
-                               remque(ip);
-                               ip->i_forw = ip;
-                               ip->i_back = ip;
-                               /*
-                                * as v_count == 0, the inode was on the free
-                                * list already, just leave it there, it will
-                                * fall off the bottom eventually. We could
-                                * perhaps move it to the head of the free
-                                * list, but as umounts are done so
-                                * infrequently, we would gain very little,
-                                * while making the code bigger.
-                                */
-#ifdef QUOTA
-                               dqrele(ip->i_dquot);
-                               ip->i_dquot = NODQUOT;
-#endif
-                               if (ip->i_devvp) {
-                                       vrele(ip->i_devvp);
-                                       ip->i_devvp = 0;
-                               }
-                       }
-       }
-       return (0);
-}
-
-/*
- * Lock an inode. If its already locked, set the WANT bit and sleep.
- */
-ilock(ip)
-       register struct inode *ip;
-{
-
-       while (ip->i_flag & ILOCKED) {
-               ip->i_flag |= IWANT;
-               (void) sleep((caddr_t)ip, PINOD);
-       }
-       ip->i_flag |= ILOCKED;
-}
-
-/*
- * Unlock an inode.  If WANT bit is on, wakeup.
- */
-iunlock(ip)
-       register struct inode *ip;
-{
-
-       if ((ip->i_flag & ILOCKED) == 0)
-               printf("unlocking unlocked inode %d on dev 0x%x\n",
-                       ip->i_number, ip->i_dev);
-       ip->i_flag &= ~ILOCKED;
-       if (ip->i_flag&IWANT) {
-               ip->i_flag &= ~IWANT;
-               wakeup((caddr_t)ip);
-       }
-}
-
-/*
- * Check mode permission on inode pointer. Mode is READ, WRITE or EXEC.
- * The mode is shifted to select the owner/group/other fields. The
- * super user is granted all permissions.
- *
- * NB: Called from vnode op table. It seems this could all be done
- * using vattr's but...
- */
-iaccess(ip, mode, cred)
-       register struct inode *ip;
-       register int mode;
-       struct ucred *cred;
-{
-       register gid_t *gp;
-       register struct vnode *vp = ITOV(ip);
-       int i;
-
-       /*
-        * If you're the super-user,
-        * you always get access.
-        */
-       if (cred->cr_uid == 0)
-               return (0);
-       /*
-        * Access check is based on only one of owner, group, public.
-        * If not owner, then check group. If not a member of the
-        * group, then check public access.
-        */
-       if (cred->cr_uid != ip->i_uid) {
-               mode >>= 3;
-               gp = cred->cr_groups;
-               for (i = 0; i < cred->cr_ngroups; i++, gp++)
-                       if (ip->i_gid == *gp)
-                               goto found;
-               mode >>= 3;
-found:
-               ;
-       }
-       if ((ip->i_mode & mode) != 0)
-               return (0);
-       return (EACCES);
-}