BSD 4_4_Lite1 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 a6031a2..3f06c81 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     @(#)lfs_alloc.c 8.1 (Berkeley) 6/11/93
+ *     @(#)lfs_alloc.c 8.4 (Berkeley) 1/4/94

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


@@ -71,7 +71,7 @@ lfs_valloc(ap)
        daddr_t blkno;
        ino_t new_ino;
        u_long i, max;
        daddr_t blkno;
        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;


@@ -104,7 +104,7 @@ lfs_valloc(ap)
                    fs->lfs_ifpb;
                fs->lfs_free = i;
                max = i + fs->lfs_ifpb;
                    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->if_version = 1;
                        ifp->if_daddr = LFS_UNUSED_DADDR;
                        ifp->if_nextfree = ++i;


@@ -175,7 +175,7 @@ lfs_vcreate(mp, ino, vpp)
        (*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_din.di_spare[0] = 0xdeadbeef;
        ip->i_dev = ump->um_dev;
        ip->i_number = ip->i_din.di_inumber = ino;
 ip->i_din.di_spare[0] = 0xdeadbeef;


@@ -211,15 +211,15 @@ lfs_vfree(ap)
        struct lfs *fs;
        daddr_t old_iaddr;
        ino_t ino;
        struct lfs *fs;
        daddr_t old_iaddr;
        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