add proc pointers to appropriate vnode operations

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

diff --git a/usr/src/sys/ufs/ufs/ufs_inode.c b/usr/src/sys/ufs/ufs/ufs_inode.c
index 2c19ef7..e1954e4 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_inode.c
+++ b/usr/src/sys/ufs/ufs/ufs_inode.c
@@ -2,38 +2,26 @@
  * 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%

  *
  *

- *     @(#)ufs_inode.c 7.13 (Berkeley) %G%
+ *     @(#)ufs_inode.c 7.39 (Berkeley) %G%

  */
 
 #include "param.h"
 #include "systm.h"
 #include "mount.h"
  */
 
 #include "param.h"
 #include "systm.h"
 #include "mount.h"

-#include "user.h"
+#include "proc.h"

 #include "file.h"
 #include "buf.h"
 #include "file.h"
 #include "buf.h"

-#include "cmap.h"

 #include "vnode.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 "kernel.h"
 #include "malloc.h"
 

+#include "quota.h"
+#include "inode.h"
+#include "fs.h"
+#include "ufsmount.h"
+

 #define        INOHSZ  512
 #if    ((INOHSZ&(INOHSZ-1)) == 0)
 #define        INOHASH(dev,ino)        (((dev)+(ino))&(INOHSZ-1))
 #define        INOHSZ  512
 #if    ((INOHSZ&(INOHSZ-1)) == 0)
 #define        INOHASH(dev,ino)        (((dev)+(ino))&(INOHSZ-1))


@@ -41,55 +29,32 @@
 #define        INOHASH(dev,ino)        (((unsigned)((dev)+(ino)))%INOHSZ)
 #endif
 
 #define        INOHASH(dev,ino)        (((unsigned)((dev)+(ino)))%INOHSZ)
 #endif
 

-#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; \
-}
-
-union ihead {                          /* inode LRU cache, Chris Maltby */
+union ihead {

        union  ihead *ih_head[2];
        struct inode *ih_chain[2];
 } ihead[INOHSZ];
 
        union  ihead *ih_head[2];
        struct inode *ih_chain[2];
 } ihead[INOHSZ];
 

-struct inode *ifreeh, **ifreet, *bdevlisth;
+int prtactive; /* 1 => print out reclaim of active vnodes */

 
 /*
 
 /*

- * Initialize hash links for inodes
- * and build inode free list.
+ * Initialize hash links for inodes.

  */
  */

-ihinit()
+ufs_init()

 {
        register int i;
 {
        register int i;

-       register struct inode *ip = inode;
-       register union  ihead *ih = ihead;
+       register union ihead *ih = ihead;

 
 

+#ifndef lint
+       if (VN_MAXPRIVATE < sizeof(struct inode))
+               panic("ihinit: too small");
+#endif /* not lint */

        for (i = INOHSZ; --i >= 0; ih++) {
                ih->ih_head[0] = ih;
                ih->ih_head[1] = ih;
        }
        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;
+#ifdef QUOTA
+       dqinit();
+#endif /* QUOTA */

 }
 
 /*
 }
 
 /*


@@ -110,160 +75,129 @@ iget(xp, ino, ipp)
        dev_t dev = xp->i_dev;
        struct mount *mntp = ITOV(xp)->v_mount;
        register struct fs *fs = VFSTOUFS(mntp)->um_fs;
        dev_t dev = xp->i_dev;
        struct mount *mntp = ITOV(xp)->v_mount;
        register struct fs *fs = VFSTOUFS(mntp)->um_fs;

+       extern struct vnodeops ufs_vnodeops, spec_inodeops;

        register struct inode *ip, *iq;
        register struct vnode *vp;
        register struct inode *ip, *iq;
        register struct vnode *vp;

-       struct inode *nip;
+       struct vnode *nvp;

        struct buf *bp;
        struct buf *bp;

-       struct dinode tdip, *dp;
-       union  ihead *ih;
-       int error;
+       struct dinode *dp;
+       union ihead *ih;
+       int i, error;

 
 

-loop:

        ih = &ihead[INOHASH(dev, ino)];
        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);
-                       VREF(vp);
-                       *ipp = ip;
-                       return(0);
+loop:
+       for (ip = ih->ih_chain[0]; ip != (struct inode *)ih; ip = ip->i_forw) {
+               if (ino != ip->i_number || dev != ip->i_dev)
+                       continue;
+               if ((ip->i_flag&ILOCKED) != 0) {
+                       ip->i_flag |= IWANT;
+                       sleep((caddr_t)ip, PINOD);
+                       goto loop;

                }
                }

-       if (error = getnewino(dev, ino, &nip)) {
+               if (vget(ITOV(ip)))
+                       goto loop;
+               *ipp = ip;
+               return(0);
+       }
+       /*
+        * Allocate a new inode.
+        */
+       if (error = getnewvnode(VT_UFS, mntp, &ufs_vnodeops, &nvp)) {

                *ipp = 0;
                return (error);
        }
                *ipp = 0;
                return (error);
        }

-       ip = nip;
+       ip = VTOI(nvp);
+       ip->i_vnode = nvp;
+       ip->i_flag = 0;
+       ip->i_devvp = 0;
+       ip->i_mode = 0;
+       ip->i_diroff = 0;
+       ip->i_lockf = 0;
+#ifdef QUOTA
+       for (i = 0; i < MAXQUOTAS; i++)
+               ip->i_dquot[i] = NODQUOT;
+#endif
+       /*
+        * 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.
+        */
+       ip->i_dev = dev;
+       ip->i_number = ino;
+       insque(ip, ih);
+       ILOCK(ip);

        /*
         * Read in the disk contents for the inode.
         */
        if (error = bread(VFSTOUFS(mntp)->um_devvp, fsbtodb(fs, itod(fs, ino)),
            (int)fs->fs_bsize, NOCRED, &bp)) {
                /*
        /*
         * Read in the disk contents for the inode.
         */
        if (error = bread(VFSTOUFS(mntp)->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.
+                * Iput() will take care of putting it back on the free list.

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

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

                brelse(bp);
                *ipp = 0;
                brelse(bp);
                *ipp = 0;

-               return(error);
+               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) {
-                       vp = ITOV(iq);
-                       if (dp->di_rdev != vp->v_rdev)
-                               continue;
-                       igrab(iq);
-                       if (dp->di_rdev != vp->v_rdev) {
-                               iput(iq);
-                               goto again;
-                       }
+       ip->i_din = *dp;
+       brelse(bp);
+       /*
+        * Initialize the associated vnode
+        */
+       vp = ITOV(ip);
+       vp->v_type = IFTOVT(ip->i_mode);
+       if (vp->v_type == VFIFO) {
+#ifdef FIFO
+               extern struct vnodeops fifo_inodeops;
+               vp->v_op = &fifo_inodeops;
+#else
+               iput(ip);
+               *ipp = 0;
+               return (EOPNOTSUPP);
+#endif /* FIFO */
+       }
+       if (vp->v_type == VCHR || vp->v_type == VBLK) {
+               vp->v_op = &spec_inodeops;
+               if (nvp = checkalias(vp, ip->i_rdev, mntp)) {

                        /*
                        /*

-                        * Discard unneeded inode.
+                        * Reinitialize aliased inode.

                         */
                         */

-                       remque(ip);
-                       ip->i_forw = ip;
-                       ip->i_back = ip;
-                       ip->i_number = 0;
-                       ITOV(ip)->v_type = VNON;
-                       INSFREE(ip);
-                       iunlock(ip);
-                       ip->i_flag = 0;
+                       vp = nvp;
+                       iq = VTOI(vp);
+                       iq->i_vnode = vp;
+                       iq->i_flag = 0;
+                       ILOCK(iq);
+                       iq->i_din = ip->i_din;
+                       iq->i_dev = dev;
+                       iq->i_number = ino;
+                       insque(iq, ih);

                        /*
                        /*

-                        * 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.
+                        * Discard unneeded vnode

                         */
                         */

+                       ip->i_mode = 0;
+                       iput(ip);

                        ip = iq;
                        ip = 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;

                }
        }
                }
        }

+       if (ino == ROOTINO)
+               vp->v_flag |= VROOT;

        /*
         * Finish inode initialization.
         */
        ip->i_fs = fs;
        ip->i_devvp = VFSTOUFS(mntp)->um_devvp;
        VREF(ip->i_devvp);
        /*
         * Finish inode initialization.
         */
        ip->i_fs = fs;
        ip->i_devvp = VFSTOUFS(mntp)->um_devvp;
        VREF(ip->i_devvp);

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

        /*
         * Set up a generation number for this inode if it does not
         * already have one. This should only happen on old filesystems.
        /*
         * Set up a generation number for this inode if it does not
         * already have one. This should only happen on old filesystems.


@@ -272,7 +206,7 @@ again:
                if (++nextgennumber < (u_long)time.tv_sec)
                        nextgennumber = time.tv_sec;
                ip->i_gen = nextgennumber;
                if (++nextgennumber < (u_long)time.tv_sec)
                        nextgennumber = time.tv_sec;
                ip->i_gen = nextgennumber;

-               if ((vp->v_mount->m_flag & M_RDONLY) == 0)
+               if ((vp->v_mount->mnt_flag & MNT_RDONLY) == 0)

                        ip->i_flag |= IMOD;
        }
        *ipp = ip;
                        ip->i_flag |= IMOD;
        }
        *ipp = ip;


@@ -280,169 +214,7 @@ again:
 }
 
 /*
 }
 
 /*

- * 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;
-
-       /*
-        * Remove the next inode from the free list.
-        */
-       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);
-       }
-       ip->i_flag = 0;
-       ILOCK(ip);
-       ip->i_lastr = 0;
-#endif SECSIZE
-       /*
-        * Purge old data structures associated with the inode.
-        */
-       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;
-       }
-       VREF(vp);
-       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;
-
-       /*
-        * Check for the existence of an existing vnode.
-        */
-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 (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);
-}
-
-/*
- * Decrement reference count of
- * an inode structure.
- * On the last reference,
- * write the inode out and if necessary,
- * truncate and deallocate the file.
+ * Unlock and decrement the reference count of an inode structure.

  */
 iput(ip)
        register struct inode *ip;
  */
 iput(ip)
        register struct inode *ip;


@@ -454,55 +226,94 @@ iput(ip)
        vrele(ITOV(ip));
 }
 
        vrele(ITOV(ip));
 }
 

-
-ufs_inactive(vp)
+/*
+ * Last reference to an inode, write the inode out and if necessary,
+ * truncate and deallocate the file.
+ */
+ufs_inactive(vp, p)

        struct vnode *vp;
        struct vnode *vp;

+       struct proc *p;

 {
        register struct inode *ip = VTOI(vp);
 {
        register struct inode *ip = VTOI(vp);

-       int mode, error;
+       int mode, error = 0;

 
 

-       if (ITOV(ip)->v_count != 0)
-               panic("ufs_inactive: not inactive");
+       if (prtactive && vp->v_usecount != 0)
+               vprint("ufs_inactive: pushing active", vp);

        /*
         * Get rid of inodes related to stale file handles.
         */
        /*
         * Get rid of inodes related to stale file handles.
         */

-       if (ip->i_mode == 0)
-               goto freeit;
+       if (ip->i_mode == 0) {
+               if ((vp->v_flag & VXLOCK) == 0)
+                       vgone(vp);
+               return (0);
+       }

        ILOCK(ip);
        ILOCK(ip);

-       if (ip->i_nlink <= 0 && (ITOV(ip)->v_mount->m_flag&M_RDONLY) == 0) {
-               error = itrunc(ip, (u_long)0);
+       if (ip->i_nlink <= 0 && (vp->v_mount->mnt_flag & MNT_RDONLY) == 0) {
+#ifdef QUOTA
+               if (!getinoquota(ip))
+                       (void) chkiq(ip, -1, NOCRED, 0);
+#endif
+               error = itrunc(ip, (u_long)0, 0);

                mode = ip->i_mode;
                ip->i_mode = 0;
                ip->i_rdev = 0;
                ip->i_flag |= IUPD|ICHG;
                ifree(ip, ip->i_number, mode);
                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);
        }
        IUPDAT(ip, &time, &time, 0);
        IUNLOCK(ip);

-freeit:

        ip->i_flag = 0;
        /*
        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).
+        * If we are done with the inode, reclaim it
+        * so that it can be reused immediately.

         */
         */

-       INSFREE(ip);
+       if (vp->v_usecount == 0 && ip->i_mode == 0)
+               vgone(vp);

        return (error);
 }
 
 /*
        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.
+ * Reclaim an inode so that it can be used for other purposes.
+ */
+ufs_reclaim(vp)
+       register struct vnode *vp;
+{
+       register struct inode *ip = VTOI(vp);
+       int i;
+
+       if (prtactive && vp->v_usecount != 0)
+               vprint("ufs_reclaim: pushing active", vp);
+       /*
+        * Remove the inode from its hash chain.
+        */
+       remque(ip);
+       ip->i_forw = ip;
+       ip->i_back = ip;
+       /*
+        * Purge old data structures associated with the inode.
+        */
+       cache_purge(vp);
+       if (ip->i_devvp) {
+               vrele(ip->i_devvp);
+               ip->i_devvp = 0;
+       }
+#ifdef QUOTA
+       for (i = 0; i < MAXQUOTAS; i++) {
+               if (ip->i_dquot[i] != NODQUOT) {
+                       dqrele(vp, ip->i_dquot[i]);
+                       ip->i_dquot[i] = NODQUOT;
+               }
+       }
+#endif
+       ip->i_flag = 0;
+       return (0);
+}
+
+/*
+ * 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 ensure I/O order,
+ * so wait for write to complete.

  */
 iupdat(ip, ta, tm, waitfor)
        register struct inode *ip;
  */
 iupdat(ip, ta, tm, waitfor)
        register struct inode *ip;


@@ -517,7 +328,7 @@ iupdat(ip, ta, tm, waitfor)
        fs = ip->i_fs;
        if ((ip->i_flag & (IUPD|IACC|ICHG|IMOD)) == 0)
                return (0);
        fs = ip->i_fs;
        if ((ip->i_flag & (IUPD|IACC|ICHG|IMOD)) == 0)
                return (0);

-       if (vp->v_mount->m_flag & M_RDONLY)
+       if (vp->v_mount->mnt_flag & MNT_RDONLY)

                return (0);
        error = bread(ip->i_devvp, fsbtodb(fs, itod(fs, ip->i_number)),
                (int)fs->fs_bsize, NOCRED, &bp);
                return (0);
        error = bread(ip->i_devvp, fsbtodb(fs, itod(fs, ip->i_number)),
                (int)fs->fs_bsize, NOCRED, &bp);


@@ -533,7 +344,7 @@ iupdat(ip, ta, tm, waitfor)
                ip->i_ctime = time.tv_sec;
        ip->i_flag &= ~(IUPD|IACC|ICHG|IMOD);
        dp = bp->b_un.b_dino + itoo(fs, ip->i_number);
                ip->i_ctime = time.tv_sec;
        ip->i_flag &= ~(IUPD|IACC|ICHG|IMOD);
        dp = bp->b_un.b_dino + itoo(fs, ip->i_number);

-       dp->di_ic = ip->i_ic;
+       *dp = ip->i_din;

        if (waitfor) {
                return (bwrite(bp));
        } else {
        if (waitfor) {
                return (bwrite(bp));
        } else {


@@ -546,16 +357,15 @@ 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)
+itrunc(oip, length, flags)

        register struct inode *oip;
        u_long length;
        register struct inode *oip;
        u_long length;

+       int flags;

 {
        register daddr_t lastblock;
        daddr_t bn, lbn, lastiblock[NIADDR];
 {
        register daddr_t lastblock;
        daddr_t bn, lbn, lastiblock[NIADDR];


@@ -565,9 +375,10 @@ 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(ITOV(oip), length);

        if (oip->i_size <= length) {
                oip->i_flag |= ICHG|IUPD;
                error = iupdat(oip, &time, &time, 1);
        if (oip->i_size <= length) {
                oip->i_flag |= ICHG|IUPD;
                error = iupdat(oip, &time, &time, 1);


@@ -598,23 +409,24 @@ 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 = 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, NOCRED, &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
        }
        /*
         * Update file and block pointers


@@ -634,7 +446,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 = iupdat(oip, &time, &time, MNT_WAIT);

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


@@ -717,7 +530,8 @@ 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);
 }


@@ -780,6 +594,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;


@@ -821,67 +637,6 @@ indirtrunc(ip, bn, lastbn, level, countp)
        return (allerror);
 }
 
        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).
- */
-int busyprt = 0;       /* patch to print out busy inodes */
-
-#ifdef QUOTA
-iflush(dev, iq)
-       dev_t dev;
-       struct inode *iq;
-#else
-iflush(dev)
-       dev_t dev;
-#endif
-{
-       register struct inode *ip;
-       int busy = 0;
-
-       for (ip = inode; ip < inodeNINODE; ip++) {
-#ifdef QUOTA
-               if (ip == iq || ip->i_dev != dev)
-                       continue;
-#else
-               if (ip->i_dev != dev)
-                       continue;
-#endif
-               if (ITOV(ip)->v_count) {
-                       busy++;
-                       if (!busyprt)
-                               continue;
-                       printf("%s %d on dev 0x%x count %d type %d\n",
-                           "iflush: busy inode ", ip->i_number, ip->i_dev,
-                           ITOV(ip)->v_count, ITOV(ip)->v_type);
-                       continue;
-               }
-               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;
-               }
-       }
-       if (busy)
-               return (EBUSY);
-       return (0);
-}
-

 /*
  * Lock an inode. If its already locked, set the WANT bit and sleep.
  */
 /*
  * Lock an inode. If its already locked, set the WANT bit and sleep.
  */


@@ -891,8 +646,13 @@ ilock(ip)
 
        while (ip->i_flag & ILOCKED) {
                ip->i_flag |= IWANT;
 
        while (ip->i_flag & ILOCKED) {
                ip->i_flag |= IWANT;

+               if (ip->i_spare0 == curproc->p_pid)
+                       panic("locking against myself");
+               ip->i_spare1 = curproc->p_pid;

                (void) sleep((caddr_t)ip, PINOD);
        }
                (void) sleep((caddr_t)ip, PINOD);
        }

+       ip->i_spare1 = 0;
+       ip->i_spare0 = curproc->p_pid;

        ip->i_flag |= ILOCKED;
 }
 
        ip->i_flag |= ILOCKED;
 }
 


@@ -904,54 +664,11 @@ iunlock(ip)
 {
 
        if ((ip->i_flag & ILOCKED) == 0)
 {
 
        if ((ip->i_flag & ILOCKED) == 0)

-               printf("unlocking unlocked inode %d on dev 0x%x\n",
-                       ip->i_number, ip->i_dev);
+               vprint("iunlock: unlocked inode", ITOV(ip));
+       ip->i_spare0 = 0;

        ip->i_flag &= ~ILOCKED;
        if (ip->i_flag&IWANT) {
                ip->i_flag &= ~IWANT;
                wakeup((caddr_t)ip);
        }
 }
        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);
-}