return vap_bytes in bytes

SCCS-vsn: sys/nfs/nfs_subs.c 7.5
SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 7.15
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 7.15
SCCS-vsn: sys/ufs/lfs/lfs_vnops.c 7.15
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 7.15

diff --git a/usr/src/sys/nfs/nfs_subs.c b/usr/src/sys/nfs/nfs_subs.c
index 86c1643..e8619cf 100644 (file)
--- a/usr/src/sys/nfs/nfs_subs.c
+++ b/usr/src/sys/nfs/nfs_subs.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)nfs_subs.c  7.4 (Berkeley) %G%
+ *     @(#)nfs_subs.c  7.5 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -592,7 +592,7 @@ nfs_loadattrcache(vp, mdp, dposp, vaper)
        vap->va_size1 = 0;              /* OR -1 ?? */
        vap->va_blocksize = fxdr_unsigned(long, *p++);
        vap->va_rdev = fxdr_unsigned(dev_t, *p++);
        vap->va_size1 = 0;              /* OR -1 ?? */
        vap->va_blocksize = fxdr_unsigned(long, *p++);
        vap->va_rdev = fxdr_unsigned(dev_t, *p++);

-       vap->va_bytes = fxdr_unsigned(long, *p++);
+       vap->va_bytes = fxdr_unsigned(long, *p++) * vap->va_blocksize;

        vap->va_bytes1 = -1;
        vap->va_fsid = fxdr_unsigned(long, *p++);
        vap->va_fileid = fxdr_unsigned(long, *p++);
        vap->va_bytes1 = -1;
        vap->va_fsid = fxdr_unsigned(long, *p++);
        vap->va_fileid = fxdr_unsigned(long, *p++);

diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index f39abfb..7d930d0 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vnops.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)ffs_vnops.c 7.14 (Berkeley) %G%
+ *     @(#)ffs_vnops.c 7.15 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -236,11 +236,7 @@ ufs_getattr(vp, vap, cred)
                vap->va_blocksize = MAXBSIZE;
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;
                vap->va_blocksize = MAXBSIZE;
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;

-       /*
-        * XXX THIS IS NOT CORRECT!!, but be sure to change vn_stat()
-        * if you change it.
-        */
-       vap->va_bytes = ip->i_blocks;
+       vap->va_bytes = dbtob(ip->i_blocks);

        vap->va_bytes1 = -1;
        vap->va_type = vp->v_type;
        return (0);
        vap->va_bytes1 = -1;
        vap->va_type = vp->v_type;
        return (0);

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index dc90170..892eaf5 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)ufs_vnops.c 7.14 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.15 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -236,11 +236,7 @@ ufs_getattr(vp, vap, cred)
                vap->va_blocksize = MAXBSIZE;
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;
                vap->va_blocksize = MAXBSIZE;
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;

-       /*
-        * XXX THIS IS NOT CORRECT!!, but be sure to change vn_stat()
-        * if you change it.
-        */
-       vap->va_bytes = ip->i_blocks;
+       vap->va_bytes = dbtob(ip->i_blocks);

        vap->va_bytes1 = -1;
        vap->va_type = vp->v_type;
        return (0);
        vap->va_bytes1 = -1;
        vap->va_type = vp->v_type;
        return (0);

diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c
index 39b17ed..27215e3 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vnops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vnops.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)lfs_vnops.c 7.14 (Berkeley) %G%
+ *     @(#)lfs_vnops.c 7.15 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -236,11 +236,7 @@ ufs_getattr(vp, vap, cred)
                vap->va_blocksize = MAXBSIZE;
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;
                vap->va_blocksize = MAXBSIZE;
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;

-       /*
-        * XXX THIS IS NOT CORRECT!!, but be sure to change vn_stat()
-        * if you change it.
-        */
-       vap->va_bytes = ip->i_blocks;
+       vap->va_bytes = dbtob(ip->i_blocks);

        vap->va_bytes1 = -1;
        vap->va_type = vp->v_type;
        return (0);
        vap->va_bytes1 = -1;
        vap->va_type = vp->v_type;
        return (0);

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index dc90170..892eaf5 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)ufs_vnops.c 7.14 (Berkeley) %G%
+ *     @(#)ufs_vnops.c 7.15 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -236,11 +236,7 @@ ufs_getattr(vp, vap, cred)
                vap->va_blocksize = MAXBSIZE;
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;
                vap->va_blocksize = MAXBSIZE;
        else
                vap->va_blocksize = ip->i_fs->fs_bsize;

-       /*
-        * XXX THIS IS NOT CORRECT!!, but be sure to change vn_stat()
-        * if you change it.
-        */
-       vap->va_bytes = ip->i_blocks;
+       vap->va_bytes = dbtob(ip->i_blocks);

        vap->va_bytes1 = -1;
        vap->va_type = vp->v_type;
        return (0);
        vap->va_bytes1 = -1;
        vap->va_type = vp->v_type;
        return (0);