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 1ea9ae5..6460727 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vfsops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vfsops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

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

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


@@ -50,12 +50,42 @@ struct vfsops lfs_vfsops = {
        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);

 }
 
 /*
 }
 
 /*


@@ -97,13 +127,14 @@ lfs_mount(mp, path, data, ndp, p)
                         * that user has necessary permissions on the device.
                         */
                        if (p->p_ucred->cr_uid != 0) {
                         * that user has necessary permissions on the device.
                         */
                        if (p->p_ucred->cr_uid != 0) {

-                               VOP_LOCK(ump->um_devvp);
+                               vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY,
+                                   p);

                                if (error = VOP_ACCESS(ump->um_devvp,
                                    VREAD | VWRITE, p->p_ucred, p)) {
                                if (error = VOP_ACCESS(ump->um_devvp,
                                    VREAD | VWRITE, p->p_ucred, p)) {

-                                       VOP_UNLOCK(ump->um_devvp);
+                                       VOP_UNLOCK(ump->um_devvp, 0, p);

                                        return (error);
                                }
                                        return (error);
                                }

-                               VOP_UNLOCK(ump->um_devvp);
+                               VOP_UNLOCK(ump->um_devvp, 0, p);

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


@@ -138,12 +169,12 @@ lfs_mount(mp, path, data, ndp, p)
                accessmode = VREAD;
                if ((mp->mnt_flag & MNT_RDONLY) == 0)
                        accessmode |= VWRITE;
                accessmode = VREAD;
                if ((mp->mnt_flag & MNT_RDONLY) == 0)
                        accessmode |= VWRITE;

-               VOP_LOCK(devvp);
+               vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p);

                if (error = VOP_ACCESS(devvp, accessmode, p->p_ucred, p)) {
                        vput(devvp);
                        return (error);
                }
                if (error = VOP_ACCESS(devvp, accessmode, p->p_ucred, p)) {
                        vput(devvp);
                        return (error);
                }

-               VOP_UNLOCK(devvp);
+               VOP_UNLOCK(devvp, 0, p);

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


@@ -199,11 +230,13 @@ lfs_mountfs(devvp, mp, p)
        struct partinfo dpart;
        dev_t dev;
        int error, i, ronly, size;
        struct partinfo dpart;
        dev_t dev;
        int error, i, ronly, size;

+       struct ucred *cred;

 
 

+       cred = p ? p->p_ucred : NOCRED;

        if (error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, p))
                return (error);
 
        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)
+       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;


@@ -220,7 +253,7 @@ 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;


@@ -253,7 +286,7 @@ 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;
        mp->mnt_maxsymlinklen = fs->lfs_maxsymlinklen;
        mp->mnt_flag |= MNT_LOCAL;
        ump->um_mountp = mp;


@@ -283,7 +316,7 @@ lfs_mountfs(devvp, mp, p)
 out:
        if (bp)
                brelse(bp);
 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);


@@ -306,11 +339,8 @@ lfs_unmount(mp, mntflags, p)
        int i, error, flags, ronly;
 
        flags = 0;
        int i, error, flags, ronly;
 
        flags = 0;

-       if (mntflags & MNT_FORCE) {
-               if (!doforce || (mp->mnt_flag & MNT_ROOTFS))
-                       return (EINVAL);
+       if (mntflags & MNT_FORCE)

                flags |= FORCECLOSE;
                flags |= FORCECLOSE;

-       }

 
        ump = VFSTOUFS(mp);
        fs = ump->um_lfs;
 
        ump = VFSTOUFS(mp);
        fs = ump->um_lfs;


@@ -355,17 +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 = dbtofsb(fs,fs->lfs_dsize);
-       sbp->f_bfree = dbtofsb(fs, fs->lfs_bfree);
-       sbp->f_bavail = (fs->lfs_dsize * (100 - fs->lfs_minfree) / 100) -
-               (fs->lfs_dsize - fs->lfs_bfree);
-       sbp->f_bavail = dbtofsb(fs, sbp->f_bavail);
+       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_ffree = sbp->f_bfree * INOPB(fs);
        if (sbp != &mp->mnt_stat) {
        sbp->f_files = fs->lfs_nfiles;
        sbp->f_ffree = sbp->f_bfree * INOPB(fs);
        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,


@@ -414,7 +450,7 @@ lfs_vget(mp, ino, vpp)
        struct ifile *ifp;
        struct vnode *vp;
        struct ufsmount *ump;
        struct ifile *ifp;
        struct vnode *vp;
        struct ufsmount *ump;

-       daddr_t daddr;
+       ufs_daddr_t daddr;

        dev_t dev;
        int error;
 
        dev_t dev;
        int error;
 


@@ -543,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));
+}