eliminate the fiction of NOQUAD

SCCS-vsn: sys/ufs/lfs/lfs_inode.c 7.68
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.97
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.97
SCCS-vsn: sys/ufs/ffs/ffs_inode.c 7.56

diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c
index 6e0d4c5..d7ac180 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_inode.c
+++ b/usr/src/sys/ufs/ffs/ffs_inode.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_inode.c 7.55 (Berkeley) %G%
+ *     @(#)ffs_inode.c 7.56 (Berkeley) %G%

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


@@ -179,7 +179,7 @@ ffs_update (ap)
                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;
                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;

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

        }
        if (ip->i_flag&ICHG)
                ip->i_ctime.ts_sec = time.tv_sec;
        }
        if (ip->i_flag&ICHG)
                ip->i_ctime.ts_sec = time.tv_sec;

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index be94a8b..a2ce484 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.96 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.97 (Berkeley) %G%

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


@@ -36,10 +36,6 @@ static int ufs_chmod __P((struct vnode *, int, struct ucred *, struct proc *));
 static int ufs_chown
        __P((struct vnode *, uid_t, gid_t, struct ucred *, struct proc *));
 
 static int ufs_chown
        __P((struct vnode *, uid_t, gid_t, struct ucred *, struct proc *));
 

-#ifdef _NOQUAD
-#define        SETHIGH(q, h)   (q).val[_QUAD_HIGHWORD] = (h)
-#define        SETLOW(q, l)    (q).val[_QUAD_LOWWORD] = (l)
-#else /* QUAD */

 union _qcvt {
        quad_t qcvt;
        long val[2];
 union _qcvt {
        quad_t qcvt;
        long val[2];


@@ -56,7 +52,6 @@ union _qcvt {
        tmp.val[_QUAD_LOWWORD] = (l); \
        (q) = tmp.qcvt; \
 }
        tmp.val[_QUAD_LOWWORD] = (l); \
        (q) = tmp.qcvt; \
 }

-#endif /* QUAD */

 
 /*
  * Create a regular file
 
 /*
  * Create a regular file


@@ -221,12 +216,7 @@ ufs_getattr(ap)
        vap->va_uid = ip->i_uid;
        vap->va_gid = ip->i_gid;
        vap->va_rdev = (dev_t)ip->i_rdev;
        vap->va_uid = ip->i_uid;
        vap->va_gid = ip->i_gid;
        vap->va_rdev = (dev_t)ip->i_rdev;

-#ifdef tahoe
-       vap->va_size = ip->i_size;
-       vap->va_size_rsv = 0;
-#else
-       vap->va_qsize = ip->i_din.di_qsize;
-#endif
+       vap->va_size = ip->i_din.di_size;

        vap->va_atime = ip->i_atime;
        vap->va_mtime = ip->i_mtime;
        vap->va_ctime = ip->i_ctime;
        vap->va_atime = ip->i_atime;
        vap->va_mtime = ip->i_mtime;
        vap->va_ctime = ip->i_ctime;


@@ -240,9 +230,6 @@ ufs_getattr(ap)
        else
                vap->va_blocksize = vp->v_mount->mnt_stat.f_iosize;
        vap->va_bytes = dbtob(ip->i_blocks);
        else
                vap->va_blocksize = vp->v_mount->mnt_stat.f_iosize;
        vap->va_bytes = dbtob(ip->i_blocks);

-#ifdef _NOQUAD
-       vap->va_bytes_rsv = 0;
-#endif

        vap->va_type = vp->v_type;
        vap->va_filerev = ip->i_modrev;
        return (0);
        vap->va_type = vp->v_type;
        vap->va_filerev = ip->i_modrev;
        return (0);

diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c
index 8d62348..e7cfa4d 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_inode.c
+++ b/usr/src/sys/ufs/lfs/lfs_inode.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_inode.c 7.67 (Berkeley) %G%
+ *     @(#)lfs_inode.c 7.68 (Berkeley) %G%

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


@@ -178,7 +178,7 @@ lfs_update (ap)
                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;
                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;

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

        }
        if (ip->i_flag&ICHG)
                ip->i_ctime.ts_sec = time.tv_sec;
        }
        if (ip->i_flag&ICHG)
                ip->i_ctime.ts_sec = time.tv_sec;

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index be94a8b..a2ce484 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ufs_vnops.c 7.96 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.97 (Berkeley) %G%

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


@@ -36,10 +36,6 @@ static int ufs_chmod __P((struct vnode *, int, struct ucred *, struct proc *));
 static int ufs_chown
        __P((struct vnode *, uid_t, gid_t, struct ucred *, struct proc *));
 
 static int ufs_chown
        __P((struct vnode *, uid_t, gid_t, struct ucred *, struct proc *));
 

-#ifdef _NOQUAD
-#define        SETHIGH(q, h)   (q).val[_QUAD_HIGHWORD] = (h)
-#define        SETLOW(q, l)    (q).val[_QUAD_LOWWORD] = (l)
-#else /* QUAD */

 union _qcvt {
        quad_t qcvt;
        long val[2];
 union _qcvt {
        quad_t qcvt;
        long val[2];


@@ -56,7 +52,6 @@ union _qcvt {
        tmp.val[_QUAD_LOWWORD] = (l); \
        (q) = tmp.qcvt; \
 }
        tmp.val[_QUAD_LOWWORD] = (l); \
        (q) = tmp.qcvt; \
 }

-#endif /* QUAD */

 
 /*
  * Create a regular file
 
 /*
  * Create a regular file


@@ -221,12 +216,7 @@ ufs_getattr(ap)
        vap->va_uid = ip->i_uid;
        vap->va_gid = ip->i_gid;
        vap->va_rdev = (dev_t)ip->i_rdev;
        vap->va_uid = ip->i_uid;
        vap->va_gid = ip->i_gid;
        vap->va_rdev = (dev_t)ip->i_rdev;

-#ifdef tahoe
-       vap->va_size = ip->i_size;
-       vap->va_size_rsv = 0;
-#else
-       vap->va_qsize = ip->i_din.di_qsize;
-#endif
+       vap->va_size = ip->i_din.di_size;

        vap->va_atime = ip->i_atime;
        vap->va_mtime = ip->i_mtime;
        vap->va_ctime = ip->i_ctime;
        vap->va_atime = ip->i_atime;
        vap->va_mtime = ip->i_mtime;
        vap->va_ctime = ip->i_ctime;


@@ -240,9 +230,6 @@ ufs_getattr(ap)
        else
                vap->va_blocksize = vp->v_mount->mnt_stat.f_iosize;
        vap->va_bytes = dbtob(ip->i_blocks);
        else
                vap->va_blocksize = vp->v_mount->mnt_stat.f_iosize;
        vap->va_bytes = dbtob(ip->i_blocks);

-#ifdef _NOQUAD
-       vap->va_bytes_rsv = 0;
-#endif

        vap->va_type = vp->v_type;
        vap->va_filerev = ip->i_modrev;
        return (0);
        vap->va_type = vp->v_type;
        vap->va_filerev = ip->i_modrev;
        return (0);