Update to handle fragments correctly (set bsize to be fragment

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

diff --git a/usr/src/sys/ufs/lfs/lfs_vfsops.c b/usr/src/sys/ufs/lfs/lfs_vfsops.c
index 1c6429d..6460727 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vfsops.c
+++ b/usr/src/sys/ufs/lfs/lfs_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%
  *

- *     @(#)lfs_vfsops.c        7.69 (Berkeley) %G%
+ *     @(#)lfs_vfsops.c        8.20 (Berkeley) %G%

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


@@ -13,14 +13,17 @@
 #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/mount.h>
 #include <sys/buf.h>
 #include <sys/mount.h>
 #include <sys/buf.h>

+#include <sys/mbuf.h>

 #include <sys/file.h>
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/file.h>
 #include <sys/disklabel.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"


@@ -39,19 +42,50 @@ struct vfsops lfs_vfsops = {
        lfs_mount,
        ufs_start,
        lfs_unmount,
        lfs_mount,
        ufs_start,
        lfs_unmount,

-       lfs_root,
+       ufs_root,

        ufs_quotactl,
        lfs_statfs,
        lfs_sync,
        ufs_quotactl,
        lfs_statfs,
        lfs_sync,

+       lfs_vget,

        lfs_fhtovp,
        lfs_vptofh,
        lfs_init,
        lfs_fhtovp,
        lfs_vptofh,
        lfs_init,

+       lfs_sysctl,

 };
 
 };
 

-int
+/*
+ * Called by main() when ufs is going to be mounted as root.
+ */

 lfs_mountroot()
 {
 lfs_mountroot()
 {

-       panic("lfs_mountroot");         /* XXX -- implement */
+       extern struct vnode *rootvp;
+       struct fs *fs;
+       struct mount *mp;
+       struct proc *p = curproc;       /* XXX */
+       int error;
+       
+       /*
+        * Get vnodes for swapdev and rootdev.
+        */
+       if ((error = bdevvp(swapdev, &swapdev_vp)) ||
+           (error = bdevvp(rootdev, &rootvp))) {
+               printf("lfs_mountroot: can't setup bdevvp's");
+               return (error);
+       }
+       if (error = vfs_rootmountalloc("lfs", "root_device", &mp))
+               return (error);
+       if (error = lfs_mountfs(rootvp, mp, p)) {
+               mp->mnt_vfc->vfc_refcount--;
+               vfs_unbusy(mp, p);
+               free(mp, M_MOUNT);
+               return (error);
+       }
+       simple_lock(&mountlist_slock);
+       CIRCLEQ_INSERT_TAIL(&mountlist, mp, mnt_list);
+       simple_unlock(&mountlist_slock);
+       (void)lfs_statfs(mp, &mp->mnt_stat, p);
+       vfs_unbusy(mp, p);
+       return (0);

 }
 
 /*
 }
 
 /*


@@ -72,53 +106,51 @@ lfs_mount(mp, path, data, ndp, p)
        register struct lfs *fs;                                /* LFS */
        u_int size;
        int error;
        register struct lfs *fs;                                /* LFS */
        u_int size;
        int error;

+       mode_t accessmode;

 
        if (error = copyin(data, (caddr_t)&args, sizeof (struct ufs_args)))
                return (error);
 
        /* Until LFS can do NFS right.          XXX */
 
        if (error = copyin(data, (caddr_t)&args, sizeof (struct ufs_args)))
                return (error);
 
        /* Until LFS can do NFS right.          XXX */

-       if (args.exflags & MNT_EXPORTED)
+       if (args.export.ex_flags & MNT_EXPORTED)

                return (EINVAL);
                return (EINVAL);

-       /*
-        * Process export requests.
-        */
-       if ((args.exflags & MNT_EXPORTED) || (mp->mnt_flag & MNT_EXPORTED)) {
-               if (args.exflags & MNT_EXPORTED)
-                       mp->mnt_flag |= MNT_EXPORTED;
-               else
-                       mp->mnt_flag &= ~MNT_EXPORTED;
-               if (args.exflags & MNT_EXRDONLY)
-                       mp->mnt_flag |= MNT_EXRDONLY;
-               else
-                       mp->mnt_flag &= ~MNT_EXRDONLY;
-               mp->mnt_exroot = args.exroot;
-       }
+

        /*
         * If updating, check whether changing from read-only to
         * read/write; if there is no device name, that's all we do.
         */
        if (mp->mnt_flag & MNT_UPDATE) {
                ump = VFSTOUFS(mp);
        /*
         * If updating, check whether changing from read-only to
         * read/write; if there is no device name, that's all we do.
         */
        if (mp->mnt_flag & MNT_UPDATE) {
                ump = VFSTOUFS(mp);

-#ifdef NOTLFS                                                  /* LFS */
-               fs = ump->um_fs;
-               if (fs->fs_ronly && (mp->mnt_flag & MNT_RDONLY) == 0)
-                       fs->fs_ronly = 0;
-#else
-               fs = ump->um_lfs;
-               if (fs->lfs_ronly && (mp->mnt_flag & MNT_RDONLY) == 0)
+               if (fs->lfs_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) {
+                               vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY,
+                                   p);
+                               if (error = VOP_ACCESS(ump->um_devvp,
+                                   VREAD | VWRITE, p->p_ucred, p)) {
+                                       VOP_UNLOCK(ump->um_devvp, 0, p);
+                                       return (error);
+                               }
+                               VOP_UNLOCK(ump->um_devvp, 0, p);
+                       }

                        fs->lfs_ronly = 0;
                        fs->lfs_ronly = 0;

-#endif
-               if (args.fspec == 0)
-                       return (0);
+               }
+               if (args.fspec == 0) {
+                       /*
+                        * Process export requests.
+                        */
+                       return (vfs_export(mp, &ump->um_export, &args.export));
+               }

        }
        /*
         * Not an update, or updating the name: look up the name
         * and verify that it refers to a sensible block device.
         */
        }
        /*
         * Not an update, or updating the name: look up the name
         * and verify that it refers to a sensible block device.
         */

-       ndp->ni_nameiop = LOOKUP | FOLLOW;
-       ndp->ni_segflg = UIO_USERSPACE;
-       ndp->ni_dirp = args.fspec;
-       if (error = namei(ndp, p))
+       NDINIT(ndp, LOOKUP, FOLLOW, UIO_USERSPACE, args.fspec, p);
+       if (error = namei(ndp))

                return (error);
        devvp = ndp->ni_vp;
        if (devvp->v_type != VBLK) {
                return (error);
        devvp = ndp->ni_vp;
        if (devvp->v_type != VBLK) {


@@ -129,6 +161,21 @@ lfs_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;
+               vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p);
+               if (error = VOP_ACCESS(devvp, accessmode, p->p_ucred, p)) {
+                       vput(devvp);
+                       return (error);
+               }
+               VOP_UNLOCK(devvp, 0, p);
+       }

        if ((mp->mnt_flag & MNT_UPDATE) == 0)
                error = lfs_mountfs(devvp, mp, p);              /* LFS */
        else {
        if ((mp->mnt_flag & MNT_UPDATE) == 0)
                error = lfs_mountfs(devvp, mp, p);              /* LFS */
        else {


@@ -178,18 +225,18 @@ lfs_mountfs(devvp, mp, p)
        extern struct vnode *rootvp;
        register struct lfs *fs;
        register struct ufsmount *ump;
        extern struct vnode *rootvp;
        register struct lfs *fs;
        register struct ufsmount *ump;

-       struct inode *ip;

        struct vnode *vp;
        struct buf *bp;
        struct partinfo dpart;
        struct vnode *vp;
        struct buf *bp;
        struct partinfo dpart;

-       daddr_t seg_addr;

        dev_t dev;
        int error, i, ronly, size;
        dev_t dev;
        int error, i, ronly, size;

+       struct ucred *cred;

 
 

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

                return (error);
 
                return (error);
 

-       if (VOP_IOCTL(devvp, DIOCGPART, (caddr_t)&dpart, FREAD, NOCRED, p) != 0)
+       if (VOP_IOCTL(devvp, DIOCGPART, (caddr_t)&dpart, FREAD, cred, p) != 0)

                size = DEV_BSIZE;
        else {
                size = dpart.disklab->d_secsize;
                size = DEV_BSIZE;
        else {
                size = dpart.disklab->d_secsize;


@@ -206,19 +253,16 @@ lfs_mountfs(devvp, mp, p)
        ump = NULL;
 
        /* Read in the superblock. */
        ump = NULL;
 
        /* Read in the superblock. */

-       if (error = bread(devvp, LFS_LABELPAD / size, LFS_SBPAD, NOCRED, &bp))
+       if (error = bread(devvp, LFS_LABELPAD / size, LFS_SBPAD, cred, &bp))

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

-#ifdef DEBUG
-       lfs_dump_super(fs);
-#endif

 
        /* Allocate the mount structure, copy the superblock into it. */
        ump = (struct ufsmount *)malloc(sizeof *ump, M_UFSMNT, M_WAITOK);
 
        /* Allocate the mount structure, copy the superblock into it. */
        ump = (struct ufsmount *)malloc(sizeof *ump, M_UFSMNT, M_WAITOK);

-       ump->um_lfs = malloc(sizeof(struct lfs), M_UFSMNT, M_WAITOK);
-       bcopy(bp->b_un.b_addr, ump->um_lfs, sizeof(struct lfs));
+       fs = ump->um_lfs = malloc(sizeof(struct lfs), M_UFSMNT, M_WAITOK);
+       bcopy(bp->b_data, fs, sizeof(struct lfs));

        if (sizeof(struct lfs) < LFS_SBPAD)                     /* XXX why? */
                bp->b_flags |= B_INVAL;
        brelse(bp);
        if (sizeof(struct lfs) < LFS_SBPAD)                     /* XXX why? */
                bp->b_flags |= B_INVAL;
        brelse(bp);


@@ -226,10 +270,14 @@ lfs_mountfs(devvp, mp, p)
 
        /* Set up the I/O information */
        fs->lfs_iocount = 0;
 
        /* Set up the I/O information */
        fs->lfs_iocount = 0;

-       /* XXX NOTUSED: fs->lfs_seglist = NULL; */
+
+       /* Set up the ifile and lock aflags */
+       fs->lfs_doifile = 0;
+       fs->lfs_writer = 0;
+       fs->lfs_dirops = 0;
+       fs->lfs_seglock = 0;

 
        /* Set the file system readonly/modify bits. */
 
        /* Set the file system readonly/modify bits. */

-       fs = ump->um_lfs;

        fs->lfs_ronly = ronly;
        if (ronly == 0)
                fs->lfs_fmod = 1;
        fs->lfs_ronly = ronly;
        if (ronly == 0)
                fs->lfs_fmod = 1;


@@ -238,40 +286,37 @@ lfs_mountfs(devvp, mp, p)
        dev = devvp->v_rdev;
        mp->mnt_data = (qaddr_t)ump;
        mp->mnt_stat.f_fsid.val[0] = (long)dev;
        dev = devvp->v_rdev;
        mp->mnt_data = (qaddr_t)ump;
        mp->mnt_stat.f_fsid.val[0] = (long)dev;

-       mp->mnt_stat.f_fsid.val[1] = MOUNT_LFS;
+       mp->mnt_stat.f_fsid.val[1] = lfs_mount_type;
+       mp->mnt_maxsymlinklen = fs->lfs_maxsymlinklen;

        mp->mnt_flag |= MNT_LOCAL;
        ump->um_mountp = mp;
        ump->um_dev = dev;
        ump->um_devvp = devvp;
        mp->mnt_flag |= MNT_LOCAL;
        ump->um_mountp = mp;
        ump->um_dev = dev;
        ump->um_devvp = devvp;

+       ump->um_bptrtodb = 0;
+       ump->um_seqinc = 1 << fs->lfs_fsbtodb;
+       ump->um_nindir = fs->lfs_nindir;

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

+       devvp->v_specflags |= SI_MOUNTEDON;

 
 

-       /* Read the ifile disk inode and store it in a vnode. */
-       if (error = bread(devvp, fs->lfs_idaddr, fs->lfs_bsize, NOCRED, &bp))
-               goto out;
-       if (error = lfs_vcreate(mp, LFS_IFILE_INUM, &vp))
+       /*
+        * We use the ifile vnode for almost every operation.  Instead of
+        * retrieving it from the hash table each time we retrieve it here,
+        * artificially increment the reference count and keep a pointer
+        * to it in the incore copy of the superblock.
+        */
+       if (error = VFS_VGET(mp, LFS_IFILE_INUM, &vp))

                goto out;
                goto out;

-       ip = VTOI(vp);
-       VREF(ip->i_devvp);
-
-       /* The ifile inode is stored in the superblock. */

        fs->lfs_ivnode = vp;
        fs->lfs_ivnode = vp;

+       VREF(vp);
+       vput(vp);

 
 

-       /* Copy the on-disk inode into place. */
-       ip->i_din = *lfs_ifind(fs, LFS_IFILE_INUM, bp->b_un.b_dino);
-       brelse(bp);
-
-       /* Initialize the associated vnode */
-       vp->v_type = IFTOVT(ip->i_mode);
-
-       devvp->v_specflags |= SI_MOUNTEDON;
-       VREF(ip->i_devvp);

 
        return (0);
 out:
        if (bp)
                brelse(bp);
 
        return (0);
 out:
        if (bp)
                brelse(bp);

-       (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, p);
+       (void)VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, cred, p);

        if (ump) {
                free(ump->um_lfs, M_UFSMNT);
                free(ump, M_UFSMNT);
        if (ump) {
                free(ump->um_lfs, M_UFSMNT);
                free(ump, M_UFSMNT);


@@ -290,31 +335,19 @@ lfs_unmount(mp, mntflags, p)
 {
        extern int doforce;
        register struct ufsmount *ump;
 {
        extern int doforce;
        register struct ufsmount *ump;

-       register struct lfs *fs;                                /* LFS */
-       int i, error, ronly, flags = 0;
-       int ndirty;                                             /* LFS */
+       register struct lfs *fs;
+       int i, error, flags, ronly;

 
 

-#ifdef VERBOSE
-       printf("lfs_unmount\n");
-#endif
-       if (mntflags & MNT_FORCE) {
-               if (!doforce || mp == rootfs)
-                       return (EINVAL);
+       flags = 0;
+       if (mntflags & MNT_FORCE)

                flags |= FORCECLOSE;
                flags |= FORCECLOSE;

-       }
-       if (error = lfs_segwrite(mp, 1))
-               return(error);
-
-ndirty = lfs_umountdebug(mp);
-printf("lfs_umountdebug: returned %d dirty\n", ndirty);
-return(0);
-       if (mntinvalbuf(mp))
-               return (EBUSY);
+

        ump = VFSTOUFS(mp);
        ump = VFSTOUFS(mp);

+       fs = ump->um_lfs;

                return (error);
 #ifdef QUOTA
        if (mp->mnt_flag & MNT_QUOTA) {
                return (error);
 #ifdef QUOTA
        if (mp->mnt_flag & MNT_QUOTA) {

-               if (error = vflush(mp, NULLVP, SKIPSYSTEM|flags))
+               if (error = vflush(mp, fs->lfs_ivnode, SKIPSYSTEM|flags))

                        return (error);
                for (i = 0; i < MAXQUOTAS; i++) {
                        if (ump->um_quotas[i] == NULLVP)
                        return (error);
                for (i = 0; i < MAXQUOTAS; i++) {
                        if (ump->um_quotas[i] == NULLVP)


@@ -327,15 +360,17 @@ return(0);
                 */
        }
 #endif
                 */
        }
 #endif

-       if (error = vflush(mp, NULLVP, flags))
+       if (error = vflush(mp, fs->lfs_ivnode, flags))

                return (error);
                return (error);

-#ifdef NOTLFS                                                  /* LFS */
-       fs = ump->um_fs;
-       ronly = !fs->fs_ronly;
-#else
-       fs = ump->um_lfs;
+       fs->lfs_clean = 1;
+       if (error = VFS_SYNC(mp, 1, p->p_ucred, p))
+               return (error);
+       if (fs->lfs_ivnode->v_dirtyblkhd.lh_first)
+               panic("lfs_unmount: still dirty blocks on ifile vnode\n");
+       vrele(fs->lfs_ivnode);
+       vgone(fs->lfs_ivnode);
+

        ronly = !fs->lfs_ronly;
        ronly = !fs->lfs_ronly;

-#endif

  * Get file system statistics.
  */
 lfs_statfs(mp, sbp, p)
  * Get file system statistics.
  */
 lfs_statfs(mp, sbp, p)


@@ -350,16 +385,23 @@ lfs_statfs(mp, sbp, p)
        fs = ump->um_lfs;
        if (fs->lfs_magic != LFS_MAGIC)
                panic("lfs_statfs: magic");
        fs = ump->um_lfs;
        if (fs->lfs_magic != LFS_MAGIC)
                panic("lfs_statfs: magic");

-       sbp->f_type = MOUNT_LFS;
-       sbp->f_bsize = fs->lfs_bsize;
+       sbp->f_bsize = fs->lfs_fsize;

        sbp->f_iosize = fs->lfs_bsize;
        sbp->f_iosize = fs->lfs_bsize;

-       sbp->f_blocks = fs->lfs_dsize;
-       sbp->f_bfree = fs->lfs_bfree;
-       sbp->f_bavail = (fs->lfs_dsize * (100 - fs->lfs_minfree) / 100) -
-               (fs->lfs_dsize - sbp->f_bfree);
+       sbp->f_blocks = dbtofrags(fs,fs->lfs_dsize);
+       sbp->f_bfree = dbtofrags(fs, fs->lfs_bfree);
+       /*
+        * To compute the available space.  Subtract the minimum free
+        * from the total number of blocks in the file system.  Set avail
+        * to the smaller of this number and fs->lfs_bfree.
+        */
+       sbp->f_bavail = fs->lfs_dsize * (100 - fs->lfs_minfree) / 100;
+       sbp->f_bavail =
+           sbp->f_bavail > fs->lfs_bfree ? fs->lfs_bfree : sbp->f_bavail;
+       sbp->f_bavail = dbtofrags(fs, sbp->f_bavail);

        sbp->f_files = fs->lfs_nfiles;
        sbp->f_files = fs->lfs_nfiles;

-       sbp->f_ffree = fs->lfs_bfree * INOPB(fs);
+       sbp->f_ffree = sbp->f_bfree * INOPB(fs);

        if (sbp != &mp->mnt_stat) {
        if (sbp != &mp->mnt_stat) {

+               sbp->f_type = mp->mnt_vfc->vfc_typenum;

                bcopy((caddr_t)mp->mnt_stat.f_mntonname,
                        (caddr_t)&sbp->f_mntonname[0], MNAMELEN);
                bcopy((caddr_t)mp->mnt_stat.f_mntfromname,
                bcopy((caddr_t)mp->mnt_stat.f_mntonname,
                        (caddr_t)&sbp->f_mntonname[0], MNAMELEN);
                bcopy((caddr_t)mp->mnt_stat.f_mntfromname,


@@ -375,47 +417,116 @@ lfs_statfs(mp, sbp, p)
  *
  * Note: we are always called with the filesystem marked `MPBUSY'.
  */
  *
  * Note: we are always called with the filesystem marked `MPBUSY'.
  */

-lfs_sync(mp, waitfor)
+lfs_sync(mp, waitfor, cred, p)

        struct mount *mp;
        int waitfor;
        struct mount *mp;
        int waitfor;

+       struct ucred *cred;
+       struct proc *p;

 {
 {

-       extern int crashandburn, syncprt;
-       static int sync_lock, sync_want;

        int error;
 
        int error;
 

-#ifdef VERBOSE
-       printf("lfs_sync\n");
+       /* All syncs must be checkpoints until roll-forward is implemented. */
+       error = lfs_segwrite(mp, SEGM_CKP | (waitfor ? SEGM_SYNC : 0));
+#ifdef QUOTA
+       qsync(mp);

 #endif
 #endif

+       return (error);
+}

 
 

-#ifdef DIAGNOSTIC
-       if (crashandburn)
+/*
+ * Look up an LFS dinode number to find its incore vnode.  If not already
+ * in core, read it in from the specified device.  Return the inode locked.
+ * Detection and handling of mount points must be done by the calling routine.
+ */
+int
+lfs_vget(mp, ino, vpp)
+       struct mount *mp;
+       ino_t ino;
+       struct vnode **vpp;
+{
+       register struct lfs *fs;
+       register struct inode *ip;
+       struct buf *bp;
+       struct ifile *ifp;
+       struct vnode *vp;
+       struct ufsmount *ump;
+       ufs_daddr_t daddr;
+       dev_t dev;
+       int error;
+
+       ump = VFSTOUFS(mp);
+       dev = ump->um_dev;
+       if ((*vpp = ufs_ihashget(dev, ino)) != NULL)

                return (0);
                return (0);

-#endif
+
+       /* Translate the inode number to a disk address. */
+       fs = ump->um_lfs;
+       if (ino == LFS_IFILE_INUM)
+               daddr = fs->lfs_idaddr;
+       else {
+               LFS_IENTRY(ifp, fs, ino, bp);
+               daddr = ifp->if_daddr;
+               brelse(bp);
+               if (daddr == LFS_UNUSED_DADDR)
+                       return (ENOENT);
+       }
+
+       /* Allocate new vnode/inode. */
+       if (error = lfs_vcreate(mp, ino, &vp)) {
+               *vpp = NULL;
+               return (error);
+       }
+

        /*
        /*

-        * Meta data blocks are only marked dirty, not busy, so LFS syncs
-        * must be single threaded.
+        * 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.

         */
         */

-       while (sync_lock) {
-               sync_want = 1;
-               if (error = tsleep(&sync_lock, PLOCK | PCATCH, "lfs sync", 0))
-                       return (error);
-       }
-       sync_lock = 1;
+       ip = VTOI(vp);
+       ufs_ihashins(ip);

 
 

-       if (syncprt)
-               ufs_bufstats();
+       /*
+        * XXX
+        * This may not need to be here, logically it should go down with
+        * the i_devvp initialization.
+        * Ask Kirk.
+        */
+       ip->i_lfs = ump->um_lfs;

 
 

-       /* All syncs must be checkpoints until roll-forward is implemented. */
-       error = lfs_segwrite(mp, 1);
-#ifdef QUOTA
-       qsync(mp);
-#endif
-       sync_lock = 0;
-       if (sync_want) {
-               sync_want = 0;
-               wakeup(&sync_lock);
+       /* Read in the disk contents for the inode, copy into the inode. */
+       if (error =
+           bread(ump->um_devvp, daddr, (int)fs->lfs_bsize, NOCRED, &bp)) {
+               /*
+                * The inode does not contain anything useful, so it would
+                * 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().
+                */
+               vput(vp);
+               brelse(bp);
+               *vpp = NULL;
+               return (error);

        }
        }

-       return (error);
+       ip->i_din = *lfs_ifind(fs, ino, (struct dinode *)bp->b_data);
+       brelse(bp);
+
+       /*
+        * Initialize the vnode from the inode, check for aliases.  In all
+        * cases re-init ip, the underlying vnode/inode may have changed.
+        */
+       if (error = ufs_vinit(mp, lfs_specop_p, LFS_FIFOOPS, &vp)) {
+               vput(vp);
+               *vpp = NULL;
+               return (error);
+       }
+       /*
+        * Finish inode initialization now that aliasing has been resolved.
+        */
+       ip->i_devvp = ump->um_devvp;
+       VREF(ip->i_devvp);
+       *vpp = vp;
+       return (0);

 }
 
 /*
 }
 
 /*


@@ -425,7 +536,8 @@ lfs_sync(mp, waitfor)
  * - check that the inode number is valid
  * - call lfs_vget() to get the locked inode
  * - check for an unallocated inode (i_mode == 0)
  * - check that the inode number is valid
  * - call lfs_vget() to get the locked inode
  * - check for an unallocated inode (i_mode == 0)

- * - check that the generation number matches
+ * - check that the given client host has export rights and return
+ *   those rights via. exflagsp and credanonp

  *
  * XXX
  * use ifile to see if inode is allocated instead of reading off disk
  *
  * XXX
  * use ifile to see if inode is allocated instead of reading off disk


@@ -433,36 +545,20 @@ lfs_sync(mp, waitfor)
  * generational number.
  */
 int
  * generational number.
  */
 int

-lfs_fhtovp(mp, fhp, vpp)
+lfs_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)

        register struct mount *mp;
        struct fid *fhp;
        register struct mount *mp;
        struct fid *fhp;

+       struct mbuf *nam;

        struct vnode **vpp;
        struct vnode **vpp;

+       int *exflagsp;
+       struct ucred **credanonp;

 {
 {

-       register struct inode *ip;

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

-       struct vnode *nvp;
-       int error;

 
        ufhp = (struct ufid *)fhp;
        if (ufhp->ufid_ino < ROOTINO)
 
        ufhp = (struct ufid *)fhp;
        if (ufhp->ufid_ino < ROOTINO)

-               return (EINVAL);
-       if (error = lfs_vget(mp, ufhp->ufid_ino, &nvp)) {
-               *vpp = NULLVP;
-               return (error);
-       }
-       ip = VTOI(nvp);
-       if (ip->i_mode == 0) {
-               ufs_iput(ip);
-               *vpp = NULLVP;
-               return (EINVAL);
-       }
-       if (ip->i_gen != ufhp->ufid_gen) {
-               ufs_iput(ip);
-               *vpp = NULLVP;
-               return (EINVAL);
-       }
-       *vpp = nvp;
-       return (0);
+               return (ESTALE);
+       return (ufs_check_export(mp, ufhp, nam, vpp, exflagsp, credanonp));

 }
 
 /*
 }
 
 /*


@@ -483,3 +579,17 @@ lfs_vptofh(vp, fhp)
        ufhp->ufid_gen = ip->i_gen;
        return (0);
 }
        ufhp->ufid_gen = ip->i_gen;
        return (0);
 }

+
+/*
+ * Initialize the filesystem, most work done by ufs_init.
+ */
+int lfs_mount_type;
+
+int
+lfs_init(vfsp)
+       struct vfsconf *vfsp;
+{
+
+       lfs_mount_type = vfsp->vfc_typenum;
+       return (ufs_init(vfsp));
+}