projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use ufs_bmap rather than ffs_bmap.
[unix-history] / usr / src / sys / ufs / ffs / ffs_vnops.c
diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index 0b5fb29..bb4120c 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *
- *     @(#)ffs_vnops.c 7.81 (Berkeley) %G%
+ *     @(#)ffs_vnops.c 7.93 (Berkeley) %G%
  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>
@@ -18,12 +18,13 @@
 #include <sys/conf.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/conf.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
-#include <sys/specdev.h>
-#include <sys/fifo.h>
 #include <sys/malloc.h>
 
 #include <vm/vm.h>
 
 #include <sys/malloc.h>
 
 #include <vm/vm.h>
 
+#include <miscfs/specfs/specdev.h>
+#include <miscfs/fifofs/fifo.h>
+
 #include <ufs/ufs/lockf.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/lockf.h>
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
@@ -39,41 +40,40 @@ struct vnodeopv_entry_desc ffs_vnodeop_entries[] = {
        { &vop_default_desc, vn_default_error },
        { &vop_lookup_desc, ufs_lookup },               /* lookup */
        { &vop_create_desc, ufs_create },               /* create */
        { &vop_default_desc, vn_default_error },
        { &vop_lookup_desc, ufs_lookup },               /* lookup */
        { &vop_create_desc, ufs_create },               /* create */
-       { &vop_mknod_desc, ufs_mknod },         /* mknod */
-       { &vop_open_desc, ufs_open },           /* open */
-       { &vop_close_desc, ufs_close },         /* close */
+       { &vop_mknod_desc, ufs_mknod },                 /* mknod */
+       { &vop_open_desc, ufs_open },                   /* open */
+       { &vop_close_desc, ufs_close },                 /* close */
        { &vop_access_desc, ufs_access },               /* access */
        { &vop_getattr_desc, ufs_getattr },             /* getattr */
        { &vop_setattr_desc, ufs_setattr },             /* setattr */
        { &vop_access_desc, ufs_access },               /* access */
        { &vop_getattr_desc, ufs_getattr },             /* getattr */
        { &vop_setattr_desc, ufs_setattr },             /* setattr */
-       { &vop_read_desc, ffs_read },           /* read */
-       { &vop_write_desc, ffs_write },         /* write */
-       { &vop_ioctl_desc, ufs_ioctl },         /* ioctl */
+       { &vop_read_desc, ffs_read },                   /* read */
+       { &vop_write_desc, ffs_write },                 /* write */
+       { &vop_ioctl_desc, ufs_ioctl },                 /* ioctl */
        { &vop_select_desc, ufs_select },               /* select */
        { &vop_select_desc, ufs_select },               /* select */
-       { &vop_mmap_desc, ufs_mmap },           /* mmap */
-       { &vop_fsync_desc, ffs_fsync },         /* fsync */
-       { &vop_seek_desc, ufs_seek },           /* seek */
+       { &vop_mmap_desc, ufs_mmap },                   /* mmap */
+       { &vop_fsync_desc, ffs_fsync },                 /* fsync */
+       { &vop_seek_desc, ufs_seek },                   /* seek */
        { &vop_remove_desc, ufs_remove },               /* remove */
        { &vop_remove_desc, ufs_remove },               /* remove */
-       { &vop_link_desc, ufs_link },           /* link */
+       { &vop_link_desc, ufs_link },                   /* link */
        { &vop_rename_desc, ufs_rename },               /* rename */
        { &vop_rename_desc, ufs_rename },               /* rename */
-       { &vop_mkdir_desc, ufs_mkdir },         /* mkdir */
-       { &vop_rmdir_desc, ufs_rmdir },         /* rmdir */
+       { &vop_mkdir_desc, ufs_mkdir },                 /* mkdir */
+       { &vop_rmdir_desc, ufs_rmdir },                 /* rmdir */
        { &vop_symlink_desc, ufs_symlink },             /* symlink */
        { &vop_readdir_desc, ufs_readdir },             /* readdir */
        { &vop_readlink_desc, ufs_readlink },           /* readlink */
        { &vop_abortop_desc, ufs_abortop },             /* abortop */
        { &vop_inactive_desc, ffs_inactive },           /* inactive */
        { &vop_reclaim_desc, ufs_reclaim },             /* reclaim */
        { &vop_symlink_desc, ufs_symlink },             /* symlink */
        { &vop_readdir_desc, ufs_readdir },             /* readdir */
        { &vop_readlink_desc, ufs_readlink },           /* readlink */
        { &vop_abortop_desc, ufs_abortop },             /* abortop */
        { &vop_inactive_desc, ffs_inactive },           /* inactive */
        { &vop_reclaim_desc, ufs_reclaim },             /* reclaim */
-       { &vop_lock_desc, ufs_lock },           /* lock */
+       { &vop_lock_desc, ufs_lock },                   /* lock */
        { &vop_unlock_desc, ufs_unlock },               /* unlock */
        { &vop_unlock_desc, ufs_unlock },               /* unlock */
-       { &vop_bmap_desc, ffs_bmap },           /* bmap */
+       { &vop_bmap_desc, ufs_bmap },                   /* bmap */
        { &vop_strategy_desc, ufs_strategy },           /* strategy */
        { &vop_strategy_desc, ufs_strategy },           /* strategy */
-       { &vop_print_desc, ufs_print },         /* print */
+       { &vop_print_desc, ufs_print },                 /* print */
        { &vop_islocked_desc, ufs_islocked },           /* islocked */
        { &vop_advlock_desc, ufs_advlock },             /* advlock */
        { &vop_blkatoff_desc, ffs_blkatoff },           /* blkatoff */
        { &vop_islocked_desc, ufs_islocked },           /* islocked */
        { &vop_advlock_desc, ufs_advlock },             /* advlock */
        { &vop_blkatoff_desc, ffs_blkatoff },           /* blkatoff */
-       { &vop_vget_desc, ffs_vget },           /* vget */
        { &vop_valloc_desc, ffs_valloc },               /* valloc */
        { &vop_valloc_desc, ffs_valloc },               /* valloc */
-       { &vop_vfree_desc, ffs_vfree },         /* vfree */
+       { &vop_vfree_desc, ffs_vfree },                 /* vfree */
        { &vop_truncate_desc, ffs_truncate },           /* truncate */
        { &vop_update_desc, ffs_update },               /* update */
        { &vop_bwrite_desc, vn_bwrite },
        { &vop_truncate_desc, ffs_truncate },           /* truncate */
        { &vop_update_desc, ffs_update },               /* update */
        { &vop_bwrite_desc, vn_bwrite },
@@ -88,7 +88,7 @@ struct vnodeopv_entry_desc ffs_specop_entries[] = {
        { &vop_lookup_desc, spec_lookup },              /* lookup */
        { &vop_create_desc, spec_create },              /* create */
        { &vop_mknod_desc, spec_mknod },                /* mknod */
        { &vop_lookup_desc, spec_lookup },              /* lookup */
        { &vop_create_desc, spec_create },              /* create */
        { &vop_mknod_desc, spec_mknod },                /* mknod */
-       { &vop_open_desc, spec_open },          /* open */
+       { &vop_open_desc, spec_open },                  /* open */
        { &vop_close_desc, ufsspec_close },             /* close */
        { &vop_access_desc, ufs_access },               /* access */
        { &vop_getattr_desc, ufs_getattr },             /* getattr */
        { &vop_close_desc, ufsspec_close },             /* close */
        { &vop_access_desc, ufs_access },               /* access */
        { &vop_getattr_desc, ufs_getattr },             /* getattr */
@@ -97,11 +97,11 @@ struct vnodeopv_entry_desc ffs_specop_entries[] = {
        { &vop_write_desc, ufsspec_write },             /* write */
        { &vop_ioctl_desc, spec_ioctl },                /* ioctl */
        { &vop_select_desc, spec_select },              /* select */
        { &vop_write_desc, ufsspec_write },             /* write */
        { &vop_ioctl_desc, spec_ioctl },                /* ioctl */
        { &vop_select_desc, spec_select },              /* select */
-       { &vop_mmap_desc, spec_mmap },          /* mmap */
-       { &vop_fsync_desc, spec_fsync },                /* fsync */
-       { &vop_seek_desc, spec_seek },          /* seek */
+       { &vop_mmap_desc, spec_mmap },                  /* mmap */
+       { &vop_fsync_desc, ffs_fsync },                 /* fsync */
+       { &vop_seek_desc, spec_seek },                  /* seek */
        { &vop_remove_desc, spec_remove },              /* remove */
        { &vop_remove_desc, spec_remove },              /* remove */
-       { &vop_link_desc, spec_link },          /* link */
+       { &vop_link_desc, spec_link },                  /* link */
        { &vop_rename_desc, spec_rename },              /* rename */
        { &vop_mkdir_desc, spec_mkdir },                /* mkdir */
        { &vop_rmdir_desc, spec_rmdir },                /* rmdir */
        { &vop_rename_desc, spec_rename },              /* rename */
        { &vop_mkdir_desc, spec_mkdir },                /* mkdir */
        { &vop_rmdir_desc, spec_rmdir },                /* rmdir */
@@ -111,17 +111,16 @@ struct vnodeopv_entry_desc ffs_specop_entries[] = {
        { &vop_abortop_desc, spec_abortop },            /* abortop */
        { &vop_inactive_desc, ffs_inactive },           /* inactive */
        { &vop_reclaim_desc, ufs_reclaim },             /* reclaim */
        { &vop_abortop_desc, spec_abortop },            /* abortop */
        { &vop_inactive_desc, ffs_inactive },           /* inactive */
        { &vop_reclaim_desc, ufs_reclaim },             /* reclaim */
-       { &vop_lock_desc, ufs_lock },           /* lock */
+       { &vop_lock_desc, ufs_lock },                   /* lock */
        { &vop_unlock_desc, ufs_unlock },               /* unlock */
        { &vop_unlock_desc, ufs_unlock },               /* unlock */
-       { &vop_bmap_desc, spec_bmap },          /* bmap */
+       { &vop_bmap_desc, spec_bmap },                  /* bmap */
        { &vop_strategy_desc, spec_strategy },          /* strategy */
        { &vop_strategy_desc, spec_strategy },          /* strategy */
-       { &vop_print_desc, ufs_print },         /* print */
+       { &vop_print_desc, ufs_print },                 /* print */
        { &vop_islocked_desc, ufs_islocked },           /* islocked */
        { &vop_advlock_desc, spec_advlock },            /* advlock */
        { &vop_blkatoff_desc, spec_blkatoff },          /* blkatoff */
        { &vop_islocked_desc, ufs_islocked },           /* islocked */
        { &vop_advlock_desc, spec_advlock },            /* advlock */
        { &vop_blkatoff_desc, spec_blkatoff },          /* blkatoff */
-       { &vop_vget_desc, spec_vget },          /* vget */
        { &vop_valloc_desc, spec_valloc },              /* valloc */
        { &vop_valloc_desc, spec_valloc },              /* valloc */
-       { &vop_vfree_desc, spec_vfree },                /* vfree */
+       { &vop_vfree_desc, ffs_vfree },                 /* vfree */
        { &vop_truncate_desc, spec_truncate },          /* truncate */
        { &vop_update_desc, ffs_update },               /* update */
        { &vop_bwrite_desc, vn_bwrite },
        { &vop_truncate_desc, spec_truncate },          /* truncate */
        { &vop_update_desc, ffs_update },               /* update */
        { &vop_bwrite_desc, vn_bwrite },
@@ -137,7 +136,7 @@ struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
        { &vop_lookup_desc, fifo_lookup },              /* lookup */
        { &vop_create_desc, fifo_create },              /* create */
        { &vop_mknod_desc, fifo_mknod },                /* mknod */
        { &vop_lookup_desc, fifo_lookup },              /* lookup */
        { &vop_create_desc, fifo_create },              /* create */
        { &vop_mknod_desc, fifo_mknod },                /* mknod */
-       { &vop_open_desc, fifo_open },          /* open */
+       { &vop_open_desc, fifo_open },                  /* open */
        { &vop_close_desc, ufsfifo_close },             /* close */
        { &vop_access_desc, ufs_access },               /* access */
        { &vop_getattr_desc, ufs_getattr },             /* getattr */
        { &vop_close_desc, ufsfifo_close },             /* close */
        { &vop_access_desc, ufs_access },               /* access */
        { &vop_getattr_desc, ufs_getattr },             /* getattr */
@@ -146,11 +145,11 @@ struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
        { &vop_write_desc, ufsfifo_write },             /* write */
        { &vop_ioctl_desc, fifo_ioctl },                /* ioctl */
        { &vop_select_desc, fifo_select },              /* select */
        { &vop_write_desc, ufsfifo_write },             /* write */
        { &vop_ioctl_desc, fifo_ioctl },                /* ioctl */
        { &vop_select_desc, fifo_select },              /* select */
-       { &vop_mmap_desc, fifo_mmap },          /* mmap */
-       { &vop_fsync_desc, fifo_fsync },                /* fsync */
-       { &vop_seek_desc, fifo_seek },          /* seek */
+       { &vop_mmap_desc, fifo_mmap },                  /* mmap */
+       { &vop_fsync_desc, ffs_fsync },                 /* fsync */
+       { &vop_seek_desc, fifo_seek },                  /* seek */
        { &vop_remove_desc, fifo_remove },              /* remove */
        { &vop_remove_desc, fifo_remove },              /* remove */
-       { &vop_link_desc, fifo_link },          /* link */
+       { &vop_link_desc, fifo_link },                  /* link */
        { &vop_rename_desc, fifo_rename },              /* rename */
        { &vop_mkdir_desc, fifo_mkdir },                /* mkdir */
        { &vop_rmdir_desc, fifo_rmdir },                /* rmdir */
        { &vop_rename_desc, fifo_rename },              /* rename */
        { &vop_mkdir_desc, fifo_mkdir },                /* mkdir */
        { &vop_rmdir_desc, fifo_rmdir },                /* rmdir */
@@ -160,17 +159,16 @@ struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
        { &vop_abortop_desc, fifo_abortop },            /* abortop */
        { &vop_inactive_desc, ffs_inactive },           /* inactive */
        { &vop_reclaim_desc, ufs_reclaim },             /* reclaim */
        { &vop_abortop_desc, fifo_abortop },            /* abortop */
        { &vop_inactive_desc, ffs_inactive },           /* inactive */
        { &vop_reclaim_desc, ufs_reclaim },             /* reclaim */
-       { &vop_lock_desc, ufs_lock },           /* lock */
+       { &vop_lock_desc, ufs_lock },                   /* lock */
        { &vop_unlock_desc, ufs_unlock },               /* unlock */
        { &vop_unlock_desc, ufs_unlock },               /* unlock */
-       { &vop_bmap_desc, fifo_bmap },          /* bmap */
+       { &vop_bmap_desc, fifo_bmap },                  /* bmap */
        { &vop_strategy_desc, fifo_strategy },          /* strategy */
        { &vop_strategy_desc, fifo_strategy },          /* strategy */
-       { &vop_print_desc, ufs_print },         /* print */
+       { &vop_print_desc, ufs_print },                 /* print */
        { &vop_islocked_desc, ufs_islocked },           /* islocked */
        { &vop_advlock_desc, fifo_advlock },            /* advlock */
        { &vop_blkatoff_desc, fifo_blkatoff },          /* blkatoff */
        { &vop_islocked_desc, ufs_islocked },           /* islocked */
        { &vop_advlock_desc, fifo_advlock },            /* advlock */
        { &vop_blkatoff_desc, fifo_blkatoff },          /* blkatoff */
-       { &vop_vget_desc, fifo_vget },          /* vget */
        { &vop_valloc_desc, fifo_valloc },              /* valloc */
        { &vop_valloc_desc, fifo_valloc },              /* valloc */
-       { &vop_vfree_desc, fifo_vfree },                /* vfree */
+       { &vop_vfree_desc, ffs_vfree },                 /* vfree */
        { &vop_truncate_desc, fifo_truncate },          /* truncate */
        { &vop_update_desc, ffs_update },               /* update */
        { &vop_bwrite_desc, vn_bwrite },
        { &vop_truncate_desc, fifo_truncate },          /* truncate */
        { &vop_update_desc, ffs_update },               /* update */
        { &vop_bwrite_desc, vn_bwrite },
@@ -186,7 +184,12 @@ struct vnodeopv_desc ffs_fifoop_opv_desc =
  */
 /* ARGSUSED */
 ffs_read(ap)
  */
 /* ARGSUSED */
 ffs_read(ap)
-       struct vop_read_args *ap;
+       struct vop_read_args /* {
+               struct vnode *a_vp;
+               struct uio *a_uio;
+               int a_ioflag;
+               struct ucred *a_cred;
+       } */ *ap;
 {
        register struct vnode *vp = ap->a_vp;
        register struct inode *ip = VTOI(vp);
 {
        register struct vnode *vp = ap->a_vp;
        register struct inode *ip = VTOI(vp);
@@ -205,17 +208,19 @@ ffs_read(ap)
        type = ip->i_mode & IFMT;
        if (type != IFDIR && type != IFREG && type != IFLNK)
                panic("ffs_read type");
        type = ip->i_mode & IFMT;
        if (type != IFDIR && type != IFREG && type != IFLNK)
                panic("ffs_read type");
+       if (type == IFLNK && (int)ip->i_size < vp->v_mount->mnt_maxsymlinklen)
+               panic("read short symlink");
 #endif
        if (uio->uio_resid == 0)
                return (0);
        fs = ip->i_fs;
 #endif
        if (uio->uio_resid == 0)
                return (0);
        fs = ip->i_fs;
-       if (uio->uio_offset + uio->uio_resid > fs->fs_maxfilesize)
+       if ((u_quad_t)uio->uio_offset > fs->fs_maxfilesize)
                return (EFBIG);
        ip->i_flag |= IACC;
        do {
                lbn = lblkno(fs, uio->uio_offset);
                on = blkoff(fs, uio->uio_offset);
                return (EFBIG);
        ip->i_flag |= IACC;
        do {
                lbn = lblkno(fs, uio->uio_offset);
                on = blkoff(fs, uio->uio_offset);
-               n = MIN((unsigned)(fs->fs_bsize - on), uio->uio_resid);
+               n = min((unsigned)(fs->fs_bsize - on), uio->uio_resid);
                diff = ip->i_size - uio->uio_offset;
                if (diff <= 0)
                        return (0);
                diff = ip->i_size - uio->uio_offset;
                if (diff <= 0)
                        return (0);
@@ -231,7 +236,7 @@ ffs_read(ap)
                } else
                        error = bread(vp, lbn, size, NOCRED, &bp);
                vp->v_lastr = lbn;
                } else
                        error = bread(vp, lbn, size, NOCRED, &bp);
                vp->v_lastr = lbn;
-               n = MIN(n, size - bp->b_resid);
+               n = min(n, size - bp->b_resid);
                if (error) {
                        brelse(bp);
                        return (error);
                if (error) {
                        brelse(bp);
                        return (error);
@@ -248,16 +253,20 @@ ffs_read(ap)
  * Vnode op for writing.
  */
 ffs_write(ap)
  * Vnode op for writing.
  */
 ffs_write(ap)
-       struct vop_write_args *ap;
+       struct vop_write_args /* {
+               struct vnode *a_vp;
+               struct uio *a_uio;
+               int a_ioflag;
+               struct ucred *a_cred;
+       } */ *ap;
 {
 {
-       USES_VOP_TRUNCATE;
-       USES_VOP_UPDATE;
        register struct vnode *vp = ap->a_vp;
        register struct uio *uio = ap->a_uio;
        register struct inode *ip = VTOI(vp);
        register struct fs *fs;
        struct proc *p = uio->uio_procp;
        int ioflag = ap->a_ioflag;
        register struct vnode *vp = ap->a_vp;
        register struct uio *uio = ap->a_uio;
        register struct inode *ip = VTOI(vp);
        register struct fs *fs;
        struct proc *p = uio->uio_procp;
        int ioflag = ap->a_ioflag;
+       struct timeval tv;
        struct buf *bp;
        daddr_t lbn, bn;
        off_t osize;
        struct buf *bp;
        daddr_t lbn, bn;
        off_t osize;
@@ -287,7 +296,8 @@ ffs_write(ap)
        if (uio->uio_resid == 0)
                return (0);
        fs = ip->i_fs;
        if (uio->uio_resid == 0)
                return (0);
        fs = ip->i_fs;
-       if (uio->uio_offset + uio->uio_resid > fs->fs_maxfilesize)
+       if (uio->uio_offset < 0 ||
+           (u_quad_t)uio->uio_offset + uio->uio_resid > fs->fs_maxfilesize)
                return (EFBIG);
        /*
         * Maybe this should be above the vnode op call, but so long as
                return (EFBIG);
        /*
         * Maybe this should be above the vnode op call, but so long as
@@ -307,7 +317,7 @@ ffs_write(ap)
        do {
                lbn = lblkno(fs, uio->uio_offset);
                on = blkoff(fs, uio->uio_offset);
        do {
                lbn = lblkno(fs, uio->uio_offset);
                on = blkoff(fs, uio->uio_offset);
-               n = MIN((unsigned)(fs->fs_bsize - on), uio->uio_resid);
+               n = min((unsigned)(fs->fs_bsize - on), uio->uio_resid);
                if (n < fs->fs_bsize)
                        flags |= B_CLRBUF;
                else
                if (n < fs->fs_bsize)
                        flags |= B_CLRBUF;
                else
@@ -321,7 +331,7 @@ ffs_write(ap)
                }
                size = blksize(fs, ip, lbn);
                (void) vnode_pager_uncache(vp);
                }
                size = blksize(fs, ip, lbn);
                (void) vnode_pager_uncache(vp);
-               n = MIN(n, size - bp->b_resid);
+               n = min(n, size - bp->b_resid);
                error = uiomove(bp->b_un.b_addr + on, n, uio);
                if (ioflag & IO_SYNC)
                        (void) bwrite(bp);
                error = uiomove(bp->b_un.b_addr + on, n, uio);
                if (ioflag & IO_SYNC)
                        (void) bwrite(bp);
@@ -335,12 +345,15 @@ ffs_write(ap)
                        ip->i_mode &= ~(ISUID|ISGID);
        } while (error == 0 && uio->uio_resid > 0 && n != 0);
        if (error && (ioflag & IO_UNIT)) {
                        ip->i_mode &= ~(ISUID|ISGID);
        } while (error == 0 && uio->uio_resid > 0 && n != 0);
        if (error && (ioflag & IO_UNIT)) {
-               (void)VOP_TRUNCATE(vp, osize, ioflag & IO_SYNC, ap->a_cred);
+               (void)VOP_TRUNCATE(vp, osize, ioflag & IO_SYNC, ap->a_cred,
+                   uio->uio_procp);
                uio->uio_offset -= resid - uio->uio_resid;
                uio->uio_resid = resid;
        }
                uio->uio_offset -= resid - uio->uio_resid;
                uio->uio_resid = resid;
        }
-       if (!error && (ioflag & IO_SYNC))
-               error = VOP_UPDATE(vp, &time, &time, 1);
+       if (!error && (ioflag & IO_SYNC)) {
+               tv = time;
+               error = VOP_UPDATE(vp, &tv, &tv, 1);
+       }
        return (error);
 }
 
        return (error);
 }
 
@@ -350,15 +363,59 @@ ffs_write(ap)
 /* ARGSUSED */
 int
 ffs_fsync(ap)
 /* ARGSUSED */
 int
 ffs_fsync(ap)
-       struct vop_fsync_args *ap;
+       struct vop_fsync_args /* {
+               struct vnode *a_vp;
+               struct ucred *a_cred;
+               int a_waitfor;
+               struct proc *a_p;
+       } */ *ap;
 {
 {
-       USES_VOP_UPDATE;
-       struct inode *ip = VTOI(ap->a_vp);
+       register struct vnode *vp = ap->a_vp;
+       struct inode *ip = VTOI(vp);
+       register struct buf *bp;
+       struct timeval tv;
+       struct buf *nbp;
+       int s;
 
 
-       if (ap->a_fflags & FWRITE)
-               ip->i_flag |= ICHG;
-       vflushbuf(ap->a_vp, ap->a_waitfor == MNT_WAIT ? B_SYNC : 0);
-       return (VOP_UPDATE(ap->a_vp, &time, &time, ap->a_waitfor == MNT_WAIT));
+       /*
+        * Flush all dirty buffers associated with a vnode.
+        */
+loop:
+       s = splbio();
+       for (bp = vp->v_dirtyblkhd; bp; bp = nbp) {
+               nbp = bp->b_blockf;
+               if ((bp->b_flags & B_BUSY))
+                       continue;
+               if ((bp->b_flags & B_DELWRI) == 0)
+                       panic("ffs_fsync: not dirty");
+               bremfree(bp);
+               bp->b_flags |= B_BUSY;
+               splx(s);
+               /*
+                * Wait for I/O associated with indirect blocks to complete,
+                * since there is no way to quickly wait for them below.
+                */
+               if (bp->b_vp == vp || ap->a_waitfor == MNT_NOWAIT)
+                       (void) bawrite(bp);
+               else
+                       (void) bwrite(bp);
+               goto loop;
+       }
+       if (ap->a_waitfor == MNT_WAIT) {
+               while (vp->v_numoutput) {
+                       vp->v_flag |= VBWAIT;
+                       sleep((caddr_t)&vp->v_numoutput, PRIBIO + 1);
+               }
+#ifdef DIAGNOSTIC
+               if (vp->v_dirtyblkhd) {
+                       vprint("ffs_fsync: dirty", vp);
+                       goto loop;
+               }
+#endif
+       }
+       splx(s);
+       tv = time;
+       return (VOP_UPDATE(ap->a_vp, &tv, &tv, ap->a_waitfor == MNT_WAIT));
 }
 
 /*
 }
 
 /*
@@ -367,13 +424,13 @@ ffs_fsync(ap)
  */
 int
 ffs_inactive(ap)
  */
 int
 ffs_inactive(ap)
-       struct vop_inactive_args *ap;
+       struct vop_inactive_args /* {
+               struct vnode *a_vp;
+       } */ *ap;
 {
 {
-       USES_VOP_TRUNCATE;
-       USES_VOP_UPDATE;
-       USES_VOP_VFREE;
        register struct vnode *vp = ap->a_vp;
        register struct inode *ip = VTOI(vp);
        register struct vnode *vp = ap->a_vp;
        register struct inode *ip = VTOI(vp);
+       struct timeval tv;
        int mode, error;
        extern int prtactive;
 
        int mode, error;
        extern int prtactive;
 
@@ -394,15 +451,17 @@ ffs_inactive(ap)
                if (!getinoquota(ip))
                        (void)chkiq(ip, -1, NOCRED, 0);
 #endif
                if (!getinoquota(ip))
                        (void)chkiq(ip, -1, NOCRED, 0);
 #endif
-               error = VOP_TRUNCATE(vp, (off_t)0, 0, NOCRED);
+               error = VOP_TRUNCATE(vp, (off_t)0, 0, NOCRED, NULL);
                mode = ip->i_mode;
                ip->i_mode = 0;
                ip->i_rdev = 0;
                ip->i_flag |= IUPD|ICHG;
                VOP_VFREE(vp, ip->i_number, mode);
        }
                mode = ip->i_mode;
                ip->i_mode = 0;
                ip->i_rdev = 0;
                ip->i_flag |= IUPD|ICHG;
                VOP_VFREE(vp, ip->i_number, mode);
        }
-       if (ip->i_flag&(IUPD|IACC|ICHG|IMOD))
-               VOP_UPDATE(vp, &time, &time, 0);
+       if (ip->i_flag&(IUPD|IACC|ICHG|IMOD)) {
+               tv = time;
+               VOP_UPDATE(vp, &tv, &tv, 0);
+       }
        IUNLOCK(ip);
        ip->i_flag = 0;
        /*
        IUNLOCK(ip);
        ip->i_flag = 0;
        /*
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.