BSD 4_4_Lite2 release

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

diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c
index 10c0ac6..837d2ea 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -1,10 +1,36 @@
 /*
 /*

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

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)lfs_alloc.c 7.55 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)lfs_alloc.c 8.7 (Berkeley) 5/14/95

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


@@ -20,6 +46,7 @@
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufsmount.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>
 
 #include <ufs/lfs/lfs.h>
 #include <ufs/lfs/lfs_extern.h>


@@ -42,10 +69,10 @@ lfs_valloc(ap)
        struct ifile *ifp;
        struct inode *ip;
        struct vnode *vp;
        struct ifile *ifp;
        struct inode *ip;
        struct vnode *vp;

-       daddr_t blkno;
+       ufs_daddr_t blkno;

        ino_t new_ino;
        u_long i, max;
        ino_t new_ino;
        u_long i, max;

-       int bb, error;
+       int error;

 
        /* Get the head of the freelist. */
        fs = VTOI(ap->a_pvp)->i_lfs;
 
        /* Get the head of the freelist. */
        fs = VTOI(ap->a_pvp)->i_lfs;


@@ -66,30 +93,25 @@ lfs_valloc(ap)
 
        /* Extend IFILE so that the next lfs_valloc will succeed. */
        if (fs->lfs_free == LFS_UNUSED_INUM) {
 
        /* Extend IFILE so that the next lfs_valloc will succeed. */
        if (fs->lfs_free == LFS_UNUSED_INUM) {

-               bb = fsbtodb(fs, 1);
-               if (!ISSPACE(fs, bb, ap->a_cred))
-                       return(ENOSPC);

                vp = fs->lfs_ivnode;
                ip = VTOI(vp);
                blkno = lblkno(fs, ip->i_size);
                vp = fs->lfs_ivnode;
                ip = VTOI(vp);
                blkno = lblkno(fs, ip->i_size);

-               bp = getblk(vp, blkno, fs->lfs_bsize);
+               lfs_balloc(vp, 0, fs->lfs_bsize, blkno, &bp);
+               ip->i_size += fs->lfs_bsize;
+               vnode_pager_setsize(vp, (u_long)ip->i_size);
+               vnode_pager_uncache(vp);
+

                i = (blkno - fs->lfs_segtabsz - fs->lfs_cleansz) *
                    fs->lfs_ifpb;
                fs->lfs_free = i;
                max = i + fs->lfs_ifpb;
                i = (blkno - fs->lfs_segtabsz - fs->lfs_cleansz) *
                    fs->lfs_ifpb;
                fs->lfs_free = i;
                max = i + fs->lfs_ifpb;

-               for (ifp = (struct ifile *)bp->b_un.b_words; i < max; ++ifp) {
+               for (ifp = (struct ifile *)bp->b_data; i < max; ++ifp) {

                        ifp->if_version = 1;
                        ifp->if_daddr = LFS_UNUSED_DADDR;
                        ifp->if_nextfree = ++i;
                }
                ifp--;
                ifp->if_nextfree = LFS_UNUSED_INUM;
                        ifp->if_version = 1;
                        ifp->if_daddr = LFS_UNUSED_DADDR;
                        ifp->if_nextfree = ++i;
                }
                ifp--;
                ifp->if_nextfree = LFS_UNUSED_INUM;

-
-               ip->i_blocks += btodb(fs->lfs_bsize);
-               fs->lfs_bfree -= btodb(fs->lfs_bsize);
-               ip->i_size += fs->lfs_bsize;
-               vnode_pager_setsize(vp, (u_long)ip->i_size);
-               vnode_pager_uncache(vp);

                if (error = VOP_BWRITE(bp))
                        return (error);
        }
                if (error = VOP_BWRITE(bp))
                        return (error);
        }


@@ -98,8 +120,8 @@ lfs_valloc(ap)
        if (error = lfs_vcreate(ap->a_pvp->v_mount, new_ino, &vp))
                return (error);
 
        if (error = lfs_vcreate(ap->a_pvp->v_mount, new_ino, &vp))
                return (error);
 

-       ip = VTOI(vp);

 
 

+       ip = VTOI(vp);

        /* Zero out the direct and indirect block addresses. */
        bzero(&ip->i_din, sizeof(struct dinode));
        ip->i_din.di_inumber = new_ino;
        /* Zero out the direct and indirect block addresses. */
        bzero(&ip->i_din, sizeof(struct dinode));
        ip->i_din.di_inumber = new_ino;


@@ -151,10 +173,11 @@ lfs_vcreate(mp, ino, vpp)
 
        /* Initialize the inode. */
        MALLOC(ip, struct inode *, sizeof(struct inode), M_LFSNODE, M_WAITOK);
 
        /* Initialize the inode. */
        MALLOC(ip, struct inode *, sizeof(struct inode), M_LFSNODE, M_WAITOK);

+       lockinit(&ip->i_lock, PINOD, "lfsinode", 0, 0);

        (*vpp)->v_data = ip;
        ip->i_vnode = *vpp;
        ip->i_devvp = ump->um_devvp;
        (*vpp)->v_data = ip;
        ip->i_vnode = *vpp;
        ip->i_devvp = ump->um_devvp;

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

        ip->i_dev = ump->um_dev;
        ip->i_number = ip->i_din.di_inumber = ino;
        ip->i_lfs = ump->um_lfs;
        ip->i_dev = ump->um_dev;
        ip->i_number = ip->i_din.di_inumber = ino;
        ip->i_lfs = ump->um_lfs;


@@ -186,17 +209,17 @@ lfs_vfree(ap)
        struct ifile *ifp;
        struct inode *ip;
        struct lfs *fs;
        struct ifile *ifp;
        struct inode *ip;
        struct lfs *fs;

-       daddr_t old_iaddr;
+       ufs_daddr_t old_iaddr;

        ino_t ino;
        ino_t ino;

-       int error;

 
        /* Get the inode number and file system. */
        ip = VTOI(ap->a_pvp);
        fs = ip->i_lfs;
        ino = ip->i_number;
 
        /* Get the inode number and file system. */
        ip = VTOI(ap->a_pvp);
        fs = ip->i_lfs;
        ino = ip->i_number;

-       if (ip->i_flag & IMOD) {
+       if (ip->i_flag & IN_MODIFIED) {

                --fs->lfs_uinodes;
                --fs->lfs_uinodes;

-               ip->i_flag &= ~(IMOD | IACC | IUPD | ICHG);
+               ip->i_flag &=
+                   ~(IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE);

        }
        /*
         * Set the ifile's inode entry to unused, increment its version number
        }
        /*
         * Set the ifile's inode entry to unused, increment its version number