first pass at allowing user mounts/unmounts

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

diff --git a/usr/src/sys/ufs/ffs/ffs_vfsops.c b/usr/src/sys/ufs/ffs/ffs_vfsops.c
index c5e6f66..8c4783c 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vfsops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vfsops.c
@@ -1,10 +1,10 @@
 /*
 /*

- * Copyright (c) 1989, 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1991, 1993, 1994
+ *     The Regents of the University of California.  All rights reserved.

  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_vfsops.c        7.72 (Berkeley) %G%
+ *     @(#)ffs_vfsops.c        8.11 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -13,7 +13,7 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>

-#include <sys/specdev.h>
+#include <sys/socket.h>

 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/mbuf.h>


@@ -22,7 +22,8 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>

-#include <sys/socket.h>
+
+#include <miscfs/specfs/specdev.h>

 #include "ioctl.h"
 #include "disklabel.h"
 #include "stat.h"
 #include "ioctl.h"
 #include "disklabel.h"
 #include "stat.h"


@@ -41,7 +42,7 @@ struct vfsops ufs_vfsops = {
        ffs_mount,
        ufs_start,
        ffs_unmount,
        ffs_mount,
        ufs_start,
        ffs_unmount,

-       ffs_root,
+       ufs_root,

        ufs_quotactl,
        ffs_statfs,
        ffs_sync,
        ufs_quotactl,
        ffs_statfs,
        ffs_sync,


@@ -69,6 +70,12 @@ ffs_mountroot()
        struct ufsmount *ump;
        u_int size;
        int error;
        struct ufsmount *ump;
        u_int size;
        int error;

+       
+       /*
+        * Get vnodes for swapdev and rootdev.
+        */
+       if (bdevvp(swapdev, &swapdev_vp) || bdevvp(rootdev, &rootvp))
+               panic("ffs_mountroot: can't setup bdevvp's");

 
        mp = malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK);
        bzero((char *)mp, (u_long)sizeof(struct mount));
 
        mp = malloc((u_long)sizeof(struct mount), M_MOUNT, M_WAITOK);
        bzero((char *)mp, (u_long)sizeof(struct mount));


@@ -83,9 +90,8 @@ ffs_mountroot()
                free(mp, M_MOUNT);
                return (error);
        }
                free(mp, M_MOUNT);
                return (error);
        }

-       rootfs = mp;
-       mp->mnt_next = mp;
-       mp->mnt_prev = mp;
+       TAILQ_INSERT_TAIL(&mountlist, mp, mnt_list);
+       mp->mnt_flag |= MNT_ROOTFS;

        mp->mnt_vnodecovered = NULLVP;
        ump = VFSTOUFS(mp);
        fs = ump->um_fs;
        mp->mnt_vnodecovered = NULLVP;
        ump = VFSTOUFS(mp);
        fs = ump->um_fs;


@@ -120,7 +126,8 @@ ffs_mount(mp, path, data, ndp, p)
        struct ufsmount *ump;
        register struct fs *fs;
        u_int size;
        struct ufsmount *ump;
        register struct fs *fs;
        u_int size;

-       int error;
+       int error, flags;
+       mode_t accessmode;

 
        if (error = copyin(data, (caddr_t)&args, sizeof (struct ufs_args)))
                return (error);
 
        if (error = copyin(data, (caddr_t)&args, sizeof (struct ufs_args)))
                return (error);


@@ -131,23 +138,42 @@ ffs_mount(mp, path, data, ndp, p)
        if (mp->mnt_flag & MNT_UPDATE) {
                ump = VFSTOUFS(mp);
                fs = ump->um_fs;
        if (mp->mnt_flag & MNT_UPDATE) {
                ump = VFSTOUFS(mp);
                fs = ump->um_fs;

-               if (fs->fs_ronly && (mp->mnt_flag & MNT_RDONLY) == 0)
+               error = 0;
+               if (fs->fs_ronly == 0 && (mp->mnt_flag & MNT_RDONLY)) {
+                       flags = WRITECLOSE;
+                       if (mp->mnt_flag & MNT_FORCE)
+                               flags |= FORCECLOSE;
+                       if (vfs_busy(mp))
+                               return (EBUSY);
+                       error = ffs_flushfiles(mp, flags, p);
+                       vfs_unbusy(mp);
+               }
+               if (!error && (mp->mnt_flag & MNT_RELOAD))
+                       error = ffs_reload(mp, ndp->ni_cnd.cn_cred, p);
+               if (error)
+                       return (error);
+               if (fs->fs_ronly && (mp->mnt_flag & MNT_WANTRDWR)) {
+                       /*
+                        * If upgrade to read-write by non-root, then verify
+                        * that user has necessary permissions on the device.
+                        */
+                       if (p->p_ucred->cr_uid != 0) {
+                               devvp = ump->um_devvp;
+                               VOP_LOCK(devvp);
+                               if (error = VOP_ACCESS(devvp, VREAD | VWRITE,
+                                   p->p_ucred, p)) {
+                                       VOP_UNLOCK(devvp);
+                                       return (error);
+                               }
+                               VOP_UNLOCK(devvp);
+                       }

                        fs->fs_ronly = 0;
                        fs->fs_ronly = 0;

+               }

                if (args.fspec == 0) {
                        /*
                         * Process export requests.
                         */
                if (args.fspec == 0) {
                        /*
                         * Process export requests.
                         */

-                       if (args.exflags & MNT_EXPORTED) {
-                               if (error = ufs_hang_addrlist(mp, &args))
-                                       return (error);
-                               mp->mnt_flag |= MNT_EXPORTED;
-                       }
-                       if (args.exflags & MNT_DELEXPORT) {
-                               ufs_free_addrlist(ump);
-                               mp->mnt_flag &=
-                                   ~(MNT_EXPORTED | MNT_DEFEXPORTED);
-                       }
-                       return (0);
+                       return (vfs_export(mp, &ump->um_export, &args.export));

                }
        }
        /*
                }
        }
        /*


@@ -167,6 +193,21 @@ ffs_mount(mp, path, data, ndp, p)
                vrele(devvp);
                return (ENXIO);
        }
                vrele(devvp);
                return (ENXIO);
        }

+       /*
+        * If mount by non-root, then verify that user has necessary
+        * permissions on the device.
+        */
+       if (p->p_ucred->cr_uid != 0) {
+               accessmode = VREAD;
+               if ((mp->mnt_flag & MNT_RDONLY) == 0)
+                       accessmode |= VWRITE;
+               VOP_LOCK(devvp);
+               if (error = VOP_ACCESS(devvp, accessmode, p->p_ucred, p)) {
+                       vput(devvp);
+                       return (error);
+               }
+               VOP_UNLOCK(devvp);
+       }

        if ((mp->mnt_flag & MNT_UPDATE) == 0)
                error = ffs_mountfs(devvp, mp, p);
        else {
        if ((mp->mnt_flag & MNT_UPDATE) == 0)
                error = ffs_mountfs(devvp, mp, p);
        else {


@@ -192,6 +233,111 @@ ffs_mount(mp, path, data, ndp, p)
        return (0);
 }
 
        return (0);
 }
 

+/*
+ * Reload all incore data for a filesystem (used after running fsck on
+ * the root filesystem and finding things to fix). The filesystem must
+ * be mounted read-only.
+ *
+ * Things to do to update the mount:
+ *     1) invalidate all cached meta-data.
+ *     2) re-read superblock from disk.
+ *     3) re-read summary information from disk.
+ *     4) invalidate all inactive vnodes.
+ *     5) invalidate all cached file data.
+ *     6) re-read inode data for all active vnodes.
+ */
+ffs_reload(mountp, cred, p)
+       register struct mount *mountp;
+       struct ucred *cred;
+       struct proc *p;
+{
+       register struct vnode *vp, *nvp, *devvp;
+       struct inode *ip;
+       struct csum *space;
+       struct buf *bp;
+       struct fs *fs;
+       int i, blks, size, error;
+
+       if ((mountp->mnt_flag & MNT_RDONLY) == 0)
+               return (EINVAL);
+       /*
+        * Step 1: invalidate all cached meta-data.
+        */
+       devvp = VFSTOUFS(mountp)->um_devvp;
+       if (vinvalbuf(devvp, 0, cred, p, 0, 0))
+               panic("ffs_reload: dirty1");
+       /*
+        * Step 2: re-read superblock from disk.
+        */
+       if (error = bread(devvp, SBLOCK, SBSIZE, NOCRED, &bp))
+               return (error);
+       fs = (struct fs *)bp->b_data;
+       if (fs->fs_magic != FS_MAGIC || fs->fs_bsize > MAXBSIZE ||
+           fs->fs_bsize < sizeof(struct fs)) {
+               brelse(bp);
+               return (EIO);           /* XXX needs translation */
+       }
+       fs = VFSTOUFS(mountp)->um_fs;
+       bcopy(&fs->fs_csp[0], &((struct fs *)bp->b_data)->fs_csp[0],
+           sizeof(fs->fs_csp));
+       bcopy(bp->b_data, fs, (u_int)fs->fs_sbsize);
+       if (fs->fs_sbsize < SBSIZE)
+               bp->b_flags |= B_INVAL;
+       brelse(bp);
+       mountp->mnt_maxsymlinklen = fs->fs_maxsymlinklen;
+       ffs_oldfscompat(fs);
+       /*
+        * Step 3: re-read summary information from disk.
+        */
+       blks = howmany(fs->fs_cssize, fs->fs_fsize);
+       space = fs->fs_csp[0];
+       for (i = 0; i < blks; i += fs->fs_frag) {
+               size = fs->fs_bsize;
+               if (i + fs->fs_frag > blks)
+                       size = (blks - i) * fs->fs_fsize;
+               if (error = bread(devvp, fsbtodb(fs, fs->fs_csaddr + i), size,
+                   NOCRED, &bp))
+                       return (error);
+               bcopy(bp->b_data, fs->fs_csp[fragstoblks(fs, i)], (u_int)size);
+               brelse(bp);
+       }
+loop:
+       for (vp = mountp->mnt_vnodelist.lh_first; vp != NULL; vp = nvp) {
+               nvp = vp->v_mntvnodes.le_next;
+               /*
+                * Step 4: invalidate all inactive vnodes.
+                */
+               if (vp->v_usecount == 0) {
+                       vgone(vp);
+                       continue;
+               }
+               /*
+                * Step 5: invalidate all cached file data.
+                */
+               if (vget(vp, 1))
+                       goto loop;
+               if (vinvalbuf(vp, 0, cred, p, 0, 0))
+                       panic("ffs_reload: dirty2");
+               /*
+                * Step 6: re-read inode data for all active vnodes.
+                */
+               ip = VTOI(vp);
+               if (error =
+                   bread(devvp, fsbtodb(fs, ino_to_fsba(fs, ip->i_number)),
+                   (int)fs->fs_bsize, NOCRED, &bp)) {
+                       vput(vp);
+                       return (error);
+               }
+               ip->i_din = *((struct dinode *)bp->b_data +
+                   ino_to_fsbo(fs, ip->i_number));
+               brelse(bp);
+               vput(vp);
+               if (vp->v_mount != mountp)
+                       goto loop;
+       }
+       return (0);
+}
+

 /*
  * Common code for mount and mountroot
  */
 /*
  * Common code for mount and mountroot
  */


@@ -213,7 +359,7 @@ ffs_mountfs(devvp, mp, p)
        int ronly;
        extern struct vnode *rootvp;
 
        int ronly;
        extern struct vnode *rootvp;
 

-       if (error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, p))
+       if (error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, p))

                return (error);
        if (VOP_IOCTL(devvp, DIOCGPART, (caddr_t)&dpart, FREAD, NOCRED, p) != 0)
                size = DEV_BSIZE;
                return (error);
        if (VOP_IOCTL(devvp, DIOCGPART, (caddr_t)&dpart, FREAD, NOCRED, p) != 0)
                size = DEV_BSIZE;


@@ -226,7 +372,7 @@ ffs_mountfs(devvp, mp, p)
        ump = NULL;
        if (error = bread(devvp, SBLOCK, SBSIZE, NOCRED, &bp))
                goto out;
        ump = NULL;
        if (error = bread(devvp, SBLOCK, SBSIZE, NOCRED, &bp))
                goto out;

-       fs = bp->b_un.b_fs;
+       fs = (struct fs *)bp->b_data;

                error = EINVAL;         /* XXX needs translation */
                goto out;
        }
                error = EINVAL;         /* XXX needs translation */
                goto out;
        }


@@ -234,8 +380,7 @@ ffs_mountfs(devvp, mp, p)
        bzero((caddr_t)ump, sizeof *ump);
        ump->um_fs = malloc((u_long)fs->fs_sbsize, M_UFSMNT,
            M_WAITOK);
        bzero((caddr_t)ump, sizeof *ump);
        ump->um_fs = malloc((u_long)fs->fs_sbsize, M_UFSMNT,
            M_WAITOK);

-       bcopy((caddr_t)bp->b_un.b_addr, (caddr_t)ump->um_fs,
-          (u_int)fs->fs_sbsize);
+       bcopy(bp->b_data, ump->um_fs, (u_int)fs->fs_sbsize);

        if (fs->fs_sbsize < SBSIZE)
                bp->b_flags |= B_INVAL;
        brelse(bp);
        if (fs->fs_sbsize < SBSIZE)
                bp->b_flags |= B_INVAL;
        brelse(bp);


@@ -244,12 +389,6 @@ ffs_mountfs(devvp, mp, p)
        fs->fs_ronly = ronly;
        if (ronly == 0)
                fs->fs_fmod = 1;
        fs->fs_ronly = ronly;
        if (ronly == 0)
                fs->fs_fmod = 1;

-       if (havepart) {
-               dpart.part->p_fstype = FS_BSDFFS;
-               dpart.part->p_fsize = fs->fs_fsize;
-               dpart.part->p_frag = fs->fs_frag;
-               dpart.part->p_cpg = fs->fs_cpg;
-       }

 #ifdef SECSIZE
        /*
         * If we have a disk label, force per-partition
 #ifdef SECSIZE
        /*
         * If we have a disk label, force per-partition


@@ -292,7 +431,7 @@ ffs_mountfs(devvp, mp, p)
                        free(base, M_UFSMNT);
                        goto out;
                }
                        free(base, M_UFSMNT);
                        goto out;
                }

-               bcopy((caddr_t)bp->b_un.b_addr, space, (u_int)size);
+               bcopy(bp->b_data, space, (u_int)size);

                fs->fs_csp[fragstoblks(fs, i)] = (struct csum *)space;
                space += size;
                brelse(bp);
                fs->fs_csp[fragstoblks(fs, i)] = (struct csum *)space;
                space += size;
                brelse(bp);


@@ -306,13 +445,38 @@ ffs_mountfs(devvp, mp, p)
        ump->um_mountp = mp;
        ump->um_dev = dev;
        ump->um_devvp = devvp;
        ump->um_mountp = mp;
        ump->um_dev = dev;
        ump->um_devvp = devvp;

+       ump->um_nindir = fs->fs_nindir;
+       ump->um_bptrtodb = fs->fs_fsbtodb;
+       ump->um_seqinc = fs->fs_frag;

        for (i = 0; i < MAXQUOTAS; i++)
                ump->um_quotas[i] = NULLVP;
        devvp->v_specflags |= SI_MOUNTEDON;
        for (i = 0; i < MAXQUOTAS; i++)
                ump->um_quotas[i] = NULLVP;
        devvp->v_specflags |= SI_MOUNTEDON;

+       ffs_oldfscompat(fs);
+       return (0);
+out:
+       if (bp)
+               brelse(bp);
+       (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, p);
+       if (ump) {
+               free(ump->um_fs, M_UFSMNT);
+               free(ump, M_UFSMNT);
+               mp->mnt_data = (qaddr_t)0;
+       }
+       return (error);
+}

 
 

-       /* Sanity checks for old file systems.                     XXX */
-       fs->fs_npsect = MAX(fs->fs_npsect, fs->fs_nsect);       /* XXX */
-       fs->fs_interleave = MAX(fs->fs_interleave, 1);          /* XXX */
+/*
+ * Sanity checks for old file systems.
+ *
+ * XXX - goes away some day.
+ */
+ffs_oldfscompat(fs)
+       struct fs *fs;
+{
+       int i;
+
+       fs->fs_npsect = max(fs->fs_npsect, fs->fs_nsect);       /* XXX */
+       fs->fs_interleave = max(fs->fs_interleave, 1);          /* XXX */

        if (fs->fs_postblformat == FS_42POSTBLFMT)              /* XXX */
                fs->fs_nrpos = 8;                               /* XXX */
        if (fs->fs_inodefmt < FS_44INODEFMT) {                  /* XXX */
        if (fs->fs_postblformat == FS_42POSTBLFMT)              /* XXX */
                fs->fs_nrpos = 8;                               /* XXX */
        if (fs->fs_inodefmt < FS_44INODEFMT) {                  /* XXX */


@@ -328,16 +492,6 @@ ffs_mountfs(devvp, mp, p)
        }                                                       /* XXX */
 
        return (0);
        }                                                       /* XXX */
 
        return (0);

-out:
-       if (bp)
-               brelse(bp);
-       (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, p);
-       if (ump) {
-               free(ump->um_fs, M_UFSMNT);
-               free(ump, M_UFSMNT);
-               mp->mnt_data = (qaddr_t)0;
-       }
-       return (error);

 }
 
 /*
 }
 
 /*


@@ -349,17 +503,47 @@ ffs_unmount(mp, mntflags, p)
        int mntflags;
        struct proc *p;
 {
        int mntflags;
        struct proc *p;
 {

-       extern int doforce;

        register struct ufsmount *ump;
        register struct fs *fs;
        register struct ufsmount *ump;
        register struct fs *fs;

-       int i, error, flags, ronly;
+       int error, flags, ronly;

 
        flags = 0;
        if (mntflags & MNT_FORCE) {
 
        flags = 0;
        if (mntflags & MNT_FORCE) {

-               if (!doforce || mp == rootfs)
+               if (mp->mnt_flag & MNT_ROOTFS)

                        return (EINVAL);
                flags |= FORCECLOSE;
        }
                        return (EINVAL);
                flags |= FORCECLOSE;
        }

+       if (error = ffs_flushfiles(mp, flags, p))
+               return (error);
+       ump = VFSTOUFS(mp);
+       fs = ump->um_fs;
+       ronly = !fs->fs_ronly;
+       ump->um_devvp->v_specflags &= ~SI_MOUNTEDON;
+       error = VOP_CLOSE(ump->um_devvp, ronly ? FREAD : FREAD|FWRITE,
+               NOCRED, p);
+       vrele(ump->um_devvp);
+       free(fs->fs_csp[0], M_UFSMNT);
+       free(fs, M_UFSMNT);
+       free(ump, M_UFSMNT);
+       mp->mnt_data = (qaddr_t)0;
+       mp->mnt_flag &= ~MNT_LOCAL;
+       return (error);
+}
+
+/*
+ * Flush out all the files in a filesystem.
+ */
+ffs_flushfiles(mp, flags, p)
+       register struct mount *mp;
+       int flags;
+       struct proc *p;
+{
+       extern int doforce;
+       register struct ufsmount *ump;
+       int i, error;
+
+       if (!doforce)
+               flags &= ~FORCECLOSE;

        ump = VFSTOUFS(mp);
                return (error);
 #ifdef QUOTA
        ump = VFSTOUFS(mp);
                return (error);
 #ifdef QUOTA


@@ -377,10 +561,6 @@ ffs_unmount(mp, mntflags, p)
                 */
        }
 #endif
                 */
        }
 #endif

-       if (error = vflush(mp, NULLVP, flags))
-               return (error);
-       fs = ump->um_fs;
-       ronly = !fs->fs_ronly;

  * Get file system statistics.
  */
 int
  * Get file system statistics.
  */
 int


@@ -429,15 +609,12 @@ ffs_sync(mp, waitfor, cred, p)
        struct ucred *cred;
        struct proc *p;
 {
        struct ucred *cred;
        struct proc *p;
 {

-       extern int syncprt;

        register struct vnode *vp;
        register struct inode *ip;
        register struct ufsmount *ump = VFSTOUFS(mp);
        register struct fs *fs;
        int error, allerror = 0;
 
        register struct vnode *vp;
        register struct inode *ip;
        register struct ufsmount *ump = VFSTOUFS(mp);
        register struct fs *fs;
        int error, allerror = 0;
 

-       if (syncprt)
-               ufs_bufstats();

        fs = ump->um_fs;
        /*
         * Write back modified superblock.
        fs = ump->um_fs;
        /*
         * Write back modified superblock.


@@ -457,7 +634,9 @@ ffs_sync(mp, waitfor, cred, p)
         * Write back each (modified) inode.
         */
 loop:
         * Write back each (modified) inode.
         */
 loop:

-       for (vp = mp->mnt_mounth; vp; vp = vp->v_mountf) {
+       for (vp = mp->mnt_vnodelist.lh_first;
+            vp != NULL;
+            vp = vp->v_mntvnodes.le_next) {

                /*
                 * If the vnode that we are about to sync is no longer
                 * associated with this mount point, start over.
                /*
                 * If the vnode that we are about to sync is no longer
                 * associated with this mount point, start over.


@@ -467,10 +646,11 @@ loop:
                if (VOP_ISLOCKED(vp))
                        continue;
                ip = VTOI(vp);
                if (VOP_ISLOCKED(vp))
                        continue;
                ip = VTOI(vp);

-               if ((ip->i_flag & (IMOD|IACC|IUPD|ICHG)) == 0 &&
-                   vp->v_dirtyblkhd == NULL)
+               if ((ip->i_flag &
+                   (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE)) == 0 &&
+                   vp->v_dirtyblkhd.lh_first == NULL)

                        continue;
                        continue;

-               if (vget(vp))
+               if (vget(vp, 1))

                        goto loop;
                if (error = VOP_FSYNC(vp, cred, waitfor, p))
                        allerror = error;
                        goto loop;
                if (error = VOP_FSYNC(vp, cred, waitfor, p))
                        allerror = error;


@@ -488,11 +668,10 @@ loop:
 }
 
 /*
 }
 
 /*

- * Look up a FFS 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.
+ * Look up a FFS dinode number to find its incore vnode, otherwise read it
+ * in from disk.  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.

  */
 int
 ffs_vget(mp, ino, vpp)
  */
 int
 ffs_vget(mp, ino, vpp)


@@ -504,9 +683,7 @@ ffs_vget(mp, ino, vpp)
        register struct inode *ip;
        struct ufsmount *ump;
        struct buf *bp;
        register struct inode *ip;
        struct ufsmount *ump;
        struct buf *bp;

-       struct dinode *dp;

        struct vnode *vp;
        struct vnode *vp;

-       union ihead *ih;

        dev_t dev;
        int i, type, error;
 
        dev_t dev;
        int i, type, error;
 


@@ -522,13 +699,9 @@ ffs_vget(mp, ino, vpp)
        }
        type = ump->um_devvp->v_tag == VT_MFS ? M_MFSNODE : M_FFSNODE; /* XXX */
        MALLOC(ip, struct inode *, sizeof(struct inode), type, M_WAITOK);
        }
        type = ump->um_devvp->v_tag == VT_MFS ? M_MFSNODE : M_FFSNODE; /* XXX */
        MALLOC(ip, struct inode *, sizeof(struct inode), type, M_WAITOK);

+       bzero((caddr_t)ip, sizeof(struct inode));

        vp->v_data = ip;
        ip->i_vnode = vp;
        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;
        ip->i_fs = fs = ump->um_fs;
        ip->i_dev = dev;
        ip->i_number = ino;


@@ -545,26 +718,20 @@ ffs_vget(mp, ino, vpp)
        ufs_ihashins(ip);
 
        /* Read in the disk contents for the inode, copy into the inode. */
        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)),
+       if (error = bread(ump->um_devvp, fsbtodb(fs, ino_to_fsba(fs, ino)),

            (int)fs->fs_bsize, NOCRED, &bp)) {
                /*
                 * The inode does not contain anything useful, so it would
            (int)fs->fs_bsize, NOCRED, &bp)) {
                /*
                 * 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().
+                * be misleading to leave it on its hash chain. With mode
+                * still zero, it will be unlinked and returned to the free
+                * list by vput().

                 */
                 */

-               remque(ip);
-               ip->i_forw = ip;
-               ip->i_back = ip;
-
-               /* Unlock and discard unneeded inode. */
-               ufs_iput(ip);
+               vput(vp);

                brelse(bp);
                *vpp = NULL;
                return (error);
        }
                brelse(bp);
                *vpp = NULL;
                return (error);
        }

-       dp = bp->b_un.b_dino;
-       dp += itoo(fs, ino);
-       ip->i_din = *dp;
+       ip->i_din = *((struct dinode *)bp->b_data + ino_to_fsbo(fs, ino));

        brelse(bp);
 
        /*
        brelse(bp);
 
        /*


@@ -572,7 +739,7 @@ ffs_vget(mp, ino, vpp)
         * Note that the underlying vnode may have changed.
         */
        if (error = ufs_vinit(mp, ffs_specop_p, FFS_FIFOOPS, &vp)) {
         * Note that the underlying vnode may have changed.
         */
        if (error = ufs_vinit(mp, ffs_specop_p, FFS_FIFOOPS, &vp)) {

-               ufs_iput(ip);
+               vput(vp);

                *vpp = NULL;
                return (error);
        }
                *vpp = NULL;
                return (error);
        }


@@ -590,7 +757,7 @@ ffs_vget(mp, ino, vpp)
                        nextgennumber = time.tv_sec;
                ip->i_gen = nextgennumber;
                if ((vp->v_mount->mnt_flag & MNT_RDONLY) == 0)
                        nextgennumber = time.tv_sec;
                ip->i_gen = nextgennumber;
                if ((vp->v_mount->mnt_flag & MNT_RDONLY) == 0)

-                       ip->i_flag |= IMOD;
+                       ip->i_flag |= IN_MODIFIED;

        }
        /*
         * Ensure that uid and gid are correct. This is a temporary
        }
        /*
         * Ensure that uid and gid are correct. This is a temporary


@@ -624,76 +791,15 @@ ffs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
        int *exflagsp;
        struct ucred **credanonp;
 {
        int *exflagsp;
        struct ucred **credanonp;
 {

-       register struct inode *ip;

        register struct ufid *ufhp;
        register struct ufid *ufhp;

-       register struct netaddrhash *np;
-       register struct ufsmount *ump = VFSTOUFS(mp);

        struct fs *fs;
        struct fs *fs;

-       struct vnode *nvp;
-       struct sockaddr *saddr;
-       int error;

 
        ufhp = (struct ufid *)fhp;
 
        ufhp = (struct ufid *)fhp;

-       fs = ump->um_fs;
+       fs = VFSTOUFS(mp)->um_fs;

        if (ufhp->ufid_ino < ROOTINO ||
            ufhp->ufid_ino >= fs->fs_ncg * fs->fs_ipg)
                return (ESTALE);
        if (ufhp->ufid_ino < ROOTINO ||
            ufhp->ufid_ino >= fs->fs_ncg * fs->fs_ipg)
                return (ESTALE);

-       /*
-        * Get the export permission structure for this <mp, client> tuple.
-        */
-       if ((mp->mnt_flag & MNT_EXPORTED) == 0)
-               return (EACCES);
-       if (nam == NULL) {
-               np = (struct netaddrhash *)0;
-       } else {
-               /*
-                * First search for a network match.
-                */
-               np = ump->um_netaddr[NETMASK_HASH];
-               while (np) {
-                       if (netaddr_match(np->neth_family, &np->neth_haddr,
-                           &np->neth_hmask, nam))
-                               break;
-                       np = np->neth_next;
-               }
-
-               /*
-                * If not found, try for an address match.
-                */
-               if (np == (struct netaddrhash *)0) {
-                       saddr = mtod(nam, struct sockaddr *);
-                       np = ump->um_netaddr[NETADDRHASH(saddr)];
-                       while (np) {
-                               if (netaddr_match(np->neth_family,
-                                   &np->neth_haddr, (struct netaddrhash *)0,
-                                   nam))
-                                       break;
-                               np = np->neth_next;
-                       }
-               }
-       }
-       if (np == (struct netaddrhash *)0) {
-               /*
-                * If no address match, use the default if it exists.
-                */
-               if ((mp->mnt_flag & MNT_DEFEXPORTED) == 0)
-                       return (EACCES);
-               np = &ump->um_defexported;
-       }
-       if (error = VFS_VGET(mp, ufhp->ufid_ino, &nvp)) {
-               *vpp = NULLVP;
-               return (error);
-       }
-       ip = VTOI(nvp);
-       if (ip->i_mode == 0 || ip->i_gen != ufhp->ufid_gen) {
-               ufs_iput(ip);
-               *vpp = NULLVP;
-               return (ESTALE);
-       }
-       *vpp = nvp;
-       *exflagsp = np->neth_exflags;
-       *credanonp = &np->neth_anon;
-       return (0);
+       return (ufs_check_export(mp, ufhp, nam, vpp, exflagsp, credanonp));

 }
 
 /*
 }
 
 /*


@@ -733,12 +839,21 @@ ffs_sbupdate(mp, waitfor)
        bp = getblk(mp->m_dev, (daddr_t)fsbtodb(fs, SBOFF / fs->fs_fsize),
            (int)fs->fs_sbsize, fs->fs_dbsize);
 #else SECSIZE
        bp = getblk(mp->m_dev, (daddr_t)fsbtodb(fs, SBOFF / fs->fs_fsize),
            (int)fs->fs_sbsize, fs->fs_dbsize);
 #else SECSIZE

-       bp = getblk(mp->um_devvp, SBLOCK, (int)fs->fs_sbsize);
+       bp = getblk(mp->um_devvp, SBLOCK, (int)fs->fs_sbsize, 0, 0);

 #endif SECSIZE
 #endif SECSIZE

-       bcopy((caddr_t)fs, bp->b_un.b_addr, (u_int)fs->fs_sbsize);
+       bcopy((caddr_t)fs, bp->b_data, (u_int)fs->fs_sbsize);

        /* Restore compatibility to old file systems.              XXX */
        if (fs->fs_postblformat == FS_42POSTBLFMT)              /* XXX */
        /* Restore compatibility to old file systems.              XXX */
        if (fs->fs_postblformat == FS_42POSTBLFMT)              /* XXX */

-               bp->b_un.b_fs->fs_nrpos = -1;                   /* XXX */
+               ((struct fs *)bp->b_data)->fs_nrpos = -1;       /* XXX */
+       if (fs->fs_inodefmt < FS_44INODEFMT) {                  /* XXX */
+               long *lp, tmp;                                  /* XXX */
+                                                               /* XXX */
+               lp = (long *)&((struct fs *)bp->b_data)->fs_qbmask; /* XXX */
+               tmp = lp[4];                                    /* XXX */
+               for (i = 4; i > 0; i--)                         /* XXX */
+                       lp[i] = lp[i-1];                        /* XXX */
+               lp[0] = tmp;                                    /* XXX */
+       }                                                       /* XXX */

 #ifdef SECSIZE
 #ifdef tahoe
        /* restore standard fsbtodb shift */
 #ifdef SECSIZE
 #ifdef tahoe
        /* restore standard fsbtodb shift */


@@ -760,9 +875,10 @@ ffs_sbupdate(mp, waitfor)
                bp = getblk(mp->m_dev, fsbtodb(fs, fs->fs_csaddr + i), size,
                    fs->fs_dbsize);
 #else SECSIZE
                bp = getblk(mp->m_dev, fsbtodb(fs, fs->fs_csaddr + i), size,
                    fs->fs_dbsize);
 #else SECSIZE

-               bp = getblk(mp->um_devvp, fsbtodb(fs, fs->fs_csaddr + i), size);
+               bp = getblk(mp->um_devvp, fsbtodb(fs, fs->fs_csaddr + i),
+                   size, 0, 0);

 #endif SECSIZE
 #endif SECSIZE

-               bcopy(space, bp->b_un.b_addr, (u_int)size);
+               bcopy(space, bp->b_data, (u_int)size);

                space += size;
                if (waitfor == MNT_WAIT)
                        error = bwrite(bp);
                space += size;
                if (waitfor == MNT_WAIT)
                        error = bwrite(bp);