BSD 4_4_Lite1 release

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

diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c
index 9483e97..1a06aa2 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_inode.c
+++ b/usr/src/sys/ufs/lfs/lfs_inode.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_inode.c 8.1 (Berkeley) 6/11/93
+ *     @(#)lfs_inode.c 8.5 (Berkeley) 12/30/93

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


@@ -81,8 +81,8 @@ int
 lfs_update(ap)
        struct vop_update_args /* {
                struct vnode *a_vp;
 lfs_update(ap)
        struct vop_update_args /* {
                struct vnode *a_vp;

-               struct timeval *a_ta;
-               struct timeval *a_tm;
+               struct timeval *a_access;
+               struct timeval *a_modify;

                int a_waitfor;
        } */ *ap;
 {
                int a_waitfor;
        } */ *ap;
 {


@@ -92,21 +92,22 @@ lfs_update(ap)
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                return (0);
        ip = VTOI(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                return (0);
        ip = VTOI(vp);

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

                return (0);
                return (0);

-       if (ip->i_flag & IACC)
-               ip->i_atime.ts_sec = ap->a_ta->tv_sec;
-       if (ip->i_flag & IUPD) {
-               ip->i_mtime.ts_sec = ap->a_tm->tv_sec;
+       if (ip->i_flag & IN_ACCESS)
+               ip->i_atime.ts_sec = ap->a_access->tv_sec;
+       if (ip->i_flag & IN_UPDATE) {
+               ip->i_mtime.ts_sec = ap->a_modify->tv_sec;

                (ip)->i_modrev++;
        }
                (ip)->i_modrev++;
        }

-       if (ip->i_flag & ICHG)
+       if (ip->i_flag & IN_CHANGE)

                ip->i_ctime.ts_sec = time.tv_sec;
                ip->i_ctime.ts_sec = time.tv_sec;

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

 
 

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

                ++(VFSTOUFS(vp->v_mount)->um_lfs->lfs_uinodes);
                ++(VFSTOUFS(vp->v_mount)->um_lfs->lfs_uinodes);

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

 
        /* If sync, push back the vnode and any dirty blocks it may have. */
        return (ap->a_waitfor & LFS_SYNC ? lfs_vflush(vp) : 0);
 
        /* If sync, push back the vnode and any dirty blocks it may have. */
        return (ap->a_waitfor & LFS_SYNC ? lfs_vflush(vp) : 0);


@@ -175,7 +176,7 @@ lfs_truncate(ap)
 #endif
                bzero((char *)&ip->i_shortlink, (u_int)ip->i_size);
                ip->i_size = 0;
 #endif
                bzero((char *)&ip->i_shortlink, (u_int)ip->i_size);
                ip->i_size = 0;

-               ip->i_flag |= ICHG|IUPD;
+               ip->i_flag |= IN_CHANGE | IN_UPDATE;

                return (VOP_UPDATE(vp, &tv, &tv, 0));
        }
        vnode_pager_setsize(vp, (u_long)length);
                return (VOP_UPDATE(vp, &tv, &tv, 0));
        }
        vnode_pager_setsize(vp, (u_long)length);


@@ -184,7 +185,7 @@ lfs_truncate(ap)
 
        /* If length is larger than the file, just update the times. */
        if (ip->i_size <= length) {
 
        /* If length is larger than the file, just update the times. */
        if (ip->i_size <= length) {

-               ip->i_flag |= ICHG|IUPD;
+               ip->i_flag |= IN_CHANGE | IN_UPDATE;

                return (VOP_UPDATE(vp, &tv, &tv, 0));
        }
 
                return (VOP_UPDATE(vp, &tv, &tv, 0));
        }
 


@@ -216,7 +217,7 @@ lfs_truncate(ap)
                ip->i_size = length;
                size = blksize(fs);
                (void)vnode_pager_uncache(vp);
                ip->i_size = length;
                size = blksize(fs);
                (void)vnode_pager_uncache(vp);

-               bzero(bp->b_un.b_addr + offset, (unsigned)(size - offset));
+               bzero((char *)bp->b_data + offset, (u_int)(size - offset));

                allocbuf(bp, size);
                if (e1 = VOP_BWRITE(bp))
                        return (e1);
                allocbuf(bp, size);
                if (e1 = VOP_BWRITE(bp))
                        return (e1);


@@ -260,7 +261,7 @@ lfs_truncate(ap)
                                    inp->in_lbn, fs->lfs_bsize, NOCRED, &bp))
                                        panic("lfs_truncate: bread bno %d",
                                            inp->in_lbn);
                                    inp->in_lbn, fs->lfs_bsize, NOCRED, &bp))
                                        panic("lfs_truncate: bread bno %d",
                                            inp->in_lbn);

-                               daddrp = bp->b_un.b_daddr + inp->in_off;
+                               daddrp = (daddr_t *)bp->b_data + inp->in_off;

                                for (i = inp->in_off;
                                    i++ <= a_end[depth].in_off;) {
                                        daddr = *daddrp++;
                                for (i = inp->in_off;
                                    i++ <= a_end[depth].in_off;) {
                                        daddr = *daddrp++;


@@ -270,8 +271,8 @@ lfs_truncate(ap)
                                if (inp->in_off == 0)
                                        brelse (bp);
                                else {
                                if (inp->in_off == 0)
                                        brelse (bp);
                                else {

-                                       bzero(bp->b_un.b_daddr + inp->in_off,
-                                           fs->lfs_bsize - 
+                                       bzero((daddr_t *)bp->b_data +
+                                           inp->in_off, fs->lfs_bsize - 

                                            inp->in_off * sizeof(daddr_t));
                                        if (e1 = VOP_BWRITE(bp)) 
                                                return (e1);
                                            inp->in_off * sizeof(daddr_t));
                                        if (e1 = VOP_BWRITE(bp)) 
                                                return (e1);


@@ -309,7 +310,7 @@ lfs_truncate(ap)
 #endif
        ip->i_blocks -= fsbtodb(fs, blocksreleased);
        fs->lfs_bfree +=  fsbtodb(fs, blocksreleased);
 #endif
        ip->i_blocks -= fsbtodb(fs, blocksreleased);
        fs->lfs_bfree +=  fsbtodb(fs, blocksreleased);

-       ip->i_flag |= ICHG|IUPD;
+       ip->i_flag |= IN_CHANGE | IN_UPDATE;

        /*
         * Traverse dirty block list counting number of dirty buffers
         * that are being deleted out of the cache, so that the lfs_avail
        /*
         * Traverse dirty block list counting number of dirty buffers
         * that are being deleted out of the cache, so that the lfs_avail


@@ -317,7 +318,7 @@ lfs_truncate(ap)
         */
        a_released = 0;
        i_released = 0;
         */
        a_released = 0;
        i_released = 0;

-       for (bp = vp->v_dirtyblkhd.le_next; bp; bp = bp->b_vnbufs.qe_next)
+       for (bp = vp->v_dirtyblkhd.lh_first; bp; bp = bp->b_vnbufs.le_next)

                if (bp->b_flags & B_LOCKED) {
                        ++a_released;
                        /*
                if (bp->b_flags & B_LOCKED) {
                        ++a_released;
                        /*