daddr_t => ufs_daddr_t

[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 87a41ae..fbd9ea2 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vfsops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vfsops.c
@@ -1,62 +1,61 @@
 /*
 /*

- * 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.58 (Berkeley) %G%
+ *     @(#)lfs_vfsops.c        8.11 (Berkeley) %G%

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "namei.h"
-#include "proc.h"
-#include "kernel.h"
-#include "vnode.h"
-#include "specdev.h"
-#include "mount.h"
-#include "buf.h"
-#include "file.h"
-#include "disklabel.h"
-#include "ioctl.h"
-#include "errno.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/kernel.h>
+#include <sys/vnode.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/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"
 

-#include "../ufs/quota.h"
-#include "../ufs/inode.h"
-#include "../ufs/ufsmount.h"
-#include "lfs.h"
-#include "lfs_extern.h"
+#include <ufs/ufs/quota.h>
+#include <ufs/ufs/inode.h>
+#include <ufs/ufs/ufsmount.h>
+#include <ufs/ufs/ufs_extern.h>
+
+#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_extern.h>

 
 

-static int     lfs_mountfs
-                   __P((struct vnode *, struct mount *, struct proc *));
-static int     sbupdate __P((struct ufsmount *, int));
+int lfs_mountfs __P((struct vnode *, struct mount *, struct proc *));

 
 struct vfsops lfs_vfsops = {
        lfs_mount,
        ufs_start,
        lfs_unmount,
 
 struct vfsops lfs_vfsops = {
        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_fhtovp,

-       ufs_vptofh,
-       lfs_init
+       lfs_vptofh,
+       lfs_init,

 };
 
 };
 

-/*
- * Flag to allow forcible unmounting.
- */
-extern int doforce;                                            /* LFS */
-
+int

 lfs_mountroot()
 {
 lfs_mountroot()
 {

-       /* LFS IMPLEMENT -- lfs_mountroot */
-       panic("lfs_mountroot");
+       panic("lfs_mountroot");         /* XXX -- implement */

 }
 
 /*
 }
 
 /*


@@ -74,53 +73,53 @@ lfs_mount(mp, path, data, ndp, p)
        struct vnode *devvp;
        struct ufs_args args;
        struct ufsmount *ump;
        struct vnode *devvp;
        struct ufs_args args;
        struct ufsmount *ump;

-       register LFS *fs;                                       /* LFS */
+       register struct lfs *fs;                                /* LFS */

        u_int size;
        int error;
        u_int size;
        int error;

+       mode_t accessmode;

 
 

-printf("lfs_mount\n");

        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);

-       /*
-        * 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;
-       }
+
+       /* Until LFS can do NFS right.          XXX */
+       if (args.export.ex_flags & MNT_EXPORTED)
+               return (EINVAL);
+

        /*
         * 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) {
+                               VOP_LOCK(ump->um_devvp);
+                               if (error = VOP_ACCESS(ump->um_devvp,
+                                   VREAD | VWRITE, p->p_ucred, p)) {
+                                       VOP_UNLOCK(ump->um_devvp);
+                                       return (error);
+                               }
+                               VOP_UNLOCK(ump->um_devvp);
+                       }

                        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) {


@@ -131,6 +130,21 @@ printf("lfs_mount\n");
                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 = lfs_mountfs(devvp, mp, p);              /* LFS */
        else {
        if ((mp->mnt_flag & MNT_UPDATE) == 0)
                error = lfs_mountfs(devvp, mp, p);              /* LFS */
        else {


@@ -150,7 +164,7 @@ printf("lfs_mount\n");
        bzero(fs->fs_fsmnt + size, sizeof(fs->fs_fsmnt) - size);
        bcopy((caddr_t)fs->fs_fsmnt, (caddr_t)mp->mnt_stat.f_mntonname,
            MNAMELEN);
        bzero(fs->fs_fsmnt + size, sizeof(fs->fs_fsmnt) - size);
        bcopy((caddr_t)fs->fs_fsmnt, (caddr_t)mp->mnt_stat.f_mntonname,
            MNAMELEN);

-       (void) copyinstr(args.fspec, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, 
+       (void) copyinstr(args.fspec, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,

            &size);
        bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
        (void) ufs_statfs(mp, &mp->mnt_stat, p);
            &size);
        bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
        (void) ufs_statfs(mp, &mp->mnt_stat, p);


@@ -159,7 +173,7 @@ printf("lfs_mount\n");
        bzero(fs->lfs_fsmnt + size, sizeof(fs->lfs_fsmnt) - size);
        bcopy((caddr_t)fs->lfs_fsmnt, (caddr_t)mp->mnt_stat.f_mntonname,
            MNAMELEN);
        bzero(fs->lfs_fsmnt + size, sizeof(fs->lfs_fsmnt) - size);
        bcopy((caddr_t)fs->lfs_fsmnt, (caddr_t)mp->mnt_stat.f_mntonname,
            MNAMELEN);

-       (void) copyinstr(args.fspec, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, 
+       (void) copyinstr(args.fspec, mp->mnt_stat.f_mntfromname, MNAMELEN - 1,

            &size);
        bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
        (void) lfs_statfs(mp, &mp->mnt_stat, p);
            &size);
        bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size);
        (void) lfs_statfs(mp, &mp->mnt_stat, p);


@@ -171,27 +185,27 @@ printf("lfs_mount\n");
  * Common code for mount and mountroot
  * LFS specific
  */
  * Common code for mount and mountroot
  * LFS specific
  */

-static int
+int

 lfs_mountfs(devvp, mp, p)
        register struct vnode *devvp;
        struct mount *mp;
        struct proc *p;
 {
        extern struct vnode *rootvp;
 lfs_mountfs(devvp, mp, p)
        register struct vnode *devvp;
        struct mount *mp;
        struct proc *p;
 {
        extern struct vnode *rootvp;

-       register LFS *fs;
+       register struct lfs *fs;

        register struct ufsmount *ump;
        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;


@@ -208,30 +222,31 @@ 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
-       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(LFS), M_SUPERBLK, M_WAITOK);
-       bcopy(bp->b_un.b_addr, ump->um_lfs, sizeof(LFS));
-       if (sizeof(LFS) < LFS_SBPAD)                    /* XXX why? */
+       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);
        bp = NULL;
 
        /* Set up the I/O information */
        fs->lfs_iocount = 0;
                bp->b_flags |= B_INVAL;
        brelse(bp);
        bp = NULL;
 
        /* Set up the I/O information */
        fs->lfs_iocount = 0;

-       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;


@@ -240,60 +255,40 @@ 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] = MOUNT_LFS;
+       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;

-
-       /* Read the ifile disk inode and store it in a vnode. */
-       error = bread(devvp, fs->lfs_idaddr, fs->lfs_bsize, NOCRED, &bp);
-       if (error)
-               goto out;
-       error = lfs_vcreate(mp, LFS_IFILE_INUM, &vp);
-       if (error)
-               goto out;
-       ip = VTOI(vp);
-
-       /* The ifile inode is stored in the superblock. */
-       fs->lfs_ivnode = 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;

 
        /*
 
        /*

-        * Read in the segusage table.
-        * 
-        * Since we always explicitly write the segusage table at a checkpoint,
-        * we're assuming that it is continguous on disk.
+        * 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.

         */
         */

-       seg_addr = ip->i_din.di_db[0];
-       size = fs->lfs_segtabsz << fs->lfs_bshift;
-       fs->lfs_segtab = malloc(size, M_SUPERBLK, M_WAITOK);
-       error = bread(devvp, seg_addr, size, NOCRED, &bp);
-       if (error) {
-               free(fs->lfs_segtab, M_SUPERBLK);
+       if (error = VFS_VGET(mp, LFS_IFILE_INUM, &vp))

                goto out;
                goto out;

-       }
-       bcopy((caddr_t)bp->b_un.b_addr, fs->lfs_segtab, size);
-       brelse(bp);
-       devvp->v_specflags |= SI_MOUNTEDON;
-       VREF(ip->i_devvp);
+       fs->lfs_ivnode = vp;
+       VREF(vp);
+       vput(vp);
+

 
        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) {
        if (ump) {

-               free((caddr_t)ump->um_lfs, M_SUPERBLK);
-               free((caddr_t)ump, M_UFSMNT);
+               free(ump->um_lfs, M_UFSMNT);
+               free(ump, M_UFSMNT);

                mp->mnt_data = (qaddr_t)0;
        }
        return (error);
                mp->mnt_data = (qaddr_t)0;
        }
        return (error);


@@ -307,24 +302,24 @@ lfs_unmount(mp, mntflags, p)
        int mntflags;
        struct proc *p;
 {
        int mntflags;
        struct proc *p;
 {

+       extern int doforce;

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

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

 
 

-printf("lfs_unmount\n");
+       flags = 0;

        if (mntflags & MNT_FORCE) {
        if (mntflags & MNT_FORCE) {

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

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

-       mntflushbuf(mp, 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)


@@ -337,39 +332,17 @@ printf("lfs_unmount\n");
                 */
        }
 #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;
-       ronly = !fs->lfs_ronly;
-#endif
- * Return root of a filesystem
- */
-lfs_root(mp, vpp)
-       struct mount *mp;
-       struct vnode **vpp;
-{
-       register struct inode *ip;
-       struct inode *nip;
-       struct vnode tvp;
-       int error;
-
-printf("lfs_root\n");
-       tvp.v_mount = mp;
-       ip = VTOI(&tvp);
-       ip->i_vnode = &tvp;
-       ip->i_dev = VFSTOUFS(mp)->um_dev;
-       error = lfs_iget(ip, (ino_t)ROOTINO, &nip);             /* LFS */
-       if (error)
+       fs->lfs_clean = 1;
+       if (error = VFS_SYNC(mp, 1, p->p_ucred, p))

                return (error);
                return (error);

-       *vpp = ITOV(nip);
-       return (0);
-}
+       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;

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


@@ -377,39 +350,23 @@ lfs_statfs(mp, sbp, p)
        register struct statfs *sbp;
        struct proc *p;
 {
        register struct statfs *sbp;
        struct proc *p;
 {

-       register LFS *fs;
+       register struct lfs *fs;

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

-printf("lfs_statfs\n");

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

-#ifdef NOTLFS                                                  /* LFS */
-       fs = ump->um_fs;
-       if (fs->fs_magic != FS_MAGIC)
-               panic("ufs_statfs");
-       sbp->f_type = MOUNT_UFS;
-       sbp->f_fsize = fs->fs_fsize;
-       sbp->f_bsize = fs->fs_bsize;
-       sbp->f_blocks = fs->fs_dsize;
-       sbp->f_bfree = fs->fs_cstotal.cs_nbfree * fs->fs_frag +
-               fs->fs_cstotal.cs_nffree;
-       sbp->f_bavail = (fs->fs_dsize * (100 - fs->fs_minfree) / 100) -
-               (fs->fs_dsize - sbp->f_bfree);
-       sbp->f_files =  fs->fs_ncg * fs->fs_ipg - ROOTINO;
-       sbp->f_ffree = fs->fs_cstotal.cs_nifree;
-#else

        fs = ump->um_lfs;
        if (fs->lfs_magic != LFS_MAGIC)
                panic("lfs_statfs: magic");
        sbp->f_type = MOUNT_LFS;
        fs = ump->um_lfs;
        if (fs->lfs_magic != LFS_MAGIC)
                panic("lfs_statfs: magic");
        sbp->f_type = MOUNT_LFS;

-       sbp->f_fsize = fs->lfs_bsize;

        sbp->f_bsize = fs->lfs_bsize;
        sbp->f_bsize = fs->lfs_bsize;

-       sbp->f_blocks = fs->lfs_dsize;
-       sbp->f_bfree = fs->lfs_bfree;
+       sbp->f_iosize = fs->lfs_bsize;
+       sbp->f_blocks = dbtofsb(fs,fs->lfs_dsize);
+       sbp->f_bfree = dbtofsb(fs, fs->lfs_bfree);

        sbp->f_bavail = (fs->lfs_dsize * (100 - fs->lfs_minfree) / 100) -
        sbp->f_bavail = (fs->lfs_dsize * (100 - fs->lfs_minfree) / 100) -

-               (fs->lfs_dsize - sbp->f_bfree);
+               (fs->lfs_dsize - fs->lfs_bfree);
+       sbp->f_bavail = dbtofsb(fs, sbp->f_bavail);

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

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

        if (sbp != &mp->mnt_stat) {
                bcopy((caddr_t)mp->mnt_stat.f_mntonname,
                        (caddr_t)&sbp->f_mntonname[0], MNAMELEN);
        if (sbp != &mp->mnt_stat) {
                bcopy((caddr_t)mp->mnt_stat.f_mntonname,
                        (caddr_t)&sbp->f_mntonname[0], MNAMELEN);


@@ -419,8 +376,6 @@ printf("lfs_statfs\n");
        return (0);
 }
 
        return (0);
 }
 

-extern int     syncprt;                                        /* LFS */
-

 /*
  * Go through the disk queues to initiate sandbagged IO;
  * go through the inodes to write those that have been modified;
 /*
  * Go through the disk queues to initiate sandbagged IO;
  * go through the inodes to write those that have been modified;


@@ -428,110 +383,165 @@ extern int      syncprt;                                        /* LFS */
  *
  * 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;

 {
 {

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

 
 

-printf("lfs_sync\n");
-       if (syncprt)
-               bufstats();
-#ifdef NOTLFS                                                  /* LFS */
-       fs = ump->um_fs;
-       /*
-        * Write back modified superblock.
-        * Consistency check that the superblock
-        * is still in the buffer cache.
-        */
-       if (fs->fs_fmod != 0) {
-               if (fs->fs_ronly != 0) {                /* XXX */
-                       printf("fs = %s\n", fs->fs_fsmnt);
-                       panic("update: rofs mod");
-               }
-               fs->fs_fmod = 0;
-               fs->fs_time = time.tv_sec;
-               allerror = sbupdate(ump, waitfor);
-       }
-#else
-       allerror = lfs_segwrite(mp);
-#endif
+       /* 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
 #ifdef QUOTA
        qsync(mp);
 #endif

-       return (allerror);
+       return (error);

 }
 
 }
 

-static int
-sbupdate(mp, waitfor)
-       struct ufsmount *mp;
-       int waitfor;
+/*
+ * 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;

 {
 {

-       /* LFS IMPLEMENT -- sbupdate */
-       panic("sbupdate not implemented");
+       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);
+
+       /* 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);
+       }
+
+       /*
+        * 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 = VTOI(vp);
+       ufs_ihashins(ip);
+
+       /*
+        * 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;
+
+       /* 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);
+       }
+       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);

 }
 
 /*
  * File handle to vnode
  *
  * Have to be really careful about stale file handles:
 }
 
 /*
  * File handle to vnode
  *
  * Have to be really careful about stale file handles:

- * - check that the inode number is in range
- * - call iget() to get the locked inode
+ * - check that the inode number is valid
+ * - call lfs_vget() to get the locked inode

  * - check for an unallocated inode (i_mode == 0)
  * - 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
+ * what is the relationship between my generational number and the NFS
+ * generational number.

  */
  */

-lfs_fhtovp(mp, fhp, vpp)
+int
+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 ufid *ufhp;
 {
        register struct ufid *ufhp;

-       register LFS *fs;                                       /* LFS */
+
+       ufhp = (struct ufid *)fhp;
+       if (ufhp->ufid_ino < ROOTINO)
+               return (ESTALE);
+       return (ufs_check_export(mp, ufhp, nam, vpp, exflagsp, credanonp));
+}
+
+/*
+ * Vnode pointer to File handle
+ */
+/* ARGSUSED */
+lfs_vptofh(vp, fhp)
+       struct vnode *vp;
+       struct fid *fhp;
+{

        register struct inode *ip;
        register struct inode *ip;

-       IFILE *ifp;
-       struct buf *bp;
-       struct inode *nip;
-       struct vnode tvp;
-       int error;
+       register struct ufid *ufhp;

 
 

+       ip = VTOI(vp);

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

-#ifdef NOTLFS                                                  /* LFS */
-       fs = VFSTOUFS(mp)->um_fs;
-       if (ufhp->ufid_ino < ROOTINO ||
-           ufhp->ufid_ino >= fs->fs_ncg * fs->fs_ipg) {
-               *vpp = NULLVP;
-               return (EINVAL);
-       }
-#else
-       fs = VFSTOUFS(mp)->um_lfs;
-       if (ufhp->ufid_ino < ROOTINO) {
-               *vpp = NULLVP;
-               return (EINVAL);
-       }
-#endif
-       tvp.v_mount = mp;
-       ip = VTOI(&tvp);
-       ip->i_vnode = &tvp;
-       ip->i_dev = VFSTOUFS(mp)->um_dev;
-       if (error = lfs_iget(ip, ufhp->ufid_ino, &nip)) {       /* LFS */
-               *vpp = NULLVP;
-               return (error);
-       }
-       ip = nip;
-       if (ip->i_mode == 0) {
-               iput(ip);
-               *vpp = NULLVP;
-               return (EINVAL);
-       }
-       if (ip->i_gen != ufhp->ufid_gen) {
-               iput(ip);
-               *vpp = NULLVP;
-               return (EINVAL);
-       }
-       *vpp = ITOV(ip);
+       ufhp->ufid_len = sizeof(struct ufid);
+       ufhp->ufid_ino = ip->i_number;
+       ufhp->ufid_gen = ip->i_gen;

        return (0);
 }
        return (0);
 }