STABLE14-kill-stat-blksize-20061109

FIXES 42663

don't provide a bogus hint

(cherry picked from commit 2110d5e843aef69b0753370cd5ad705b5d5afb8e)

diff --git a/src/afs/AIX/osi_file.c b/src/afs/AIX/osi_file.c
index 2c5c9af506a7861aee98796ca00be772b5fd1759..a256240022bc0d9cc43e0d0f2a14530c9e3510dc 100644 (file)
--- a/src/afs/AIX/osi_file.c
+++ b/src/afs/AIX/osi_file.c
@@ -75,7 +75,6 @@ afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat)
     AFS_GLOCK();
     if (code == 0) {
        astat->size = tvattr.va_size;
-       astat->blksize = tvattr.va_blocksize;
        astat->mtime = tvattr.va_mtime.tv_sec;
        astat->atime = tvattr.va_atime.tv_sec;
     }

diff --git a/src/afs/DARWIN/osi_file.c b/src/afs/DARWIN/osi_file.c
index c5b4a60cd01e7c311aef70d0c68978fff4803d74..279187befd463be11f3625cc70f696412e027e30 100644 (file)
--- a/src/afs/DARWIN/osi_file.c
+++ b/src/afs/DARWIN/osi_file.c
@@ -202,7 +202,6 @@ afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat)
     AFS_GLOCK();
     if (code == 0) {
        astat->size = tvattr.va_size;
-       astat->blksize = tvattr.va_blocksize;
        astat->mtime = tvattr.va_mtime.tv_sec;
        astat->atime = tvattr.va_atime.tv_sec;
     }

diff --git a/src/afs/FBSD/osi_file.c b/src/afs/FBSD/osi_file.c
index a8099aed0f47d11c92072fa87afd55f6fc89fab0..932e864613a4f22f036b36a16002d8f1ee3fca01 100644 (file)
--- a/src/afs/FBSD/osi_file.c
+++ b/src/afs/FBSD/osi_file.c
@@ -81,7 +81,6 @@ afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat)
     AFS_GLOCK();
     if (code == 0) {
        astat->size = tvattr.va_size;
-       astat->blksize = tvattr.va_blocksize;
        astat->mtime = tvattr.va_mtime.tv_sec;
        astat->atime = tvattr.va_atime.tv_sec;
     }

diff --git a/src/afs/HPUX/osi_file.c b/src/afs/HPUX/osi_file.c
index 81c7c8e42459a8a7c3fd68f057a8b3d15edb7a73..6b269b22095f2b61f2f0e5900ec60408a1ddb3b9 100644 (file)
--- a/src/afs/HPUX/osi_file.c
+++ b/src/afs/HPUX/osi_file.c
@@ -75,7 +75,6 @@ afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat)
     AFS_GLOCK();
     if (code == 0) {
        astat->size = tvattr.va_size;
-       astat->blksize = tvattr.va_blocksize;
        astat->mtime = tvattr.va_mtime.tv_sec;
        astat->atime = tvattr.va_atime.tv_sec;
     }

diff --git a/src/afs/IRIX/osi_file.c b/src/afs/IRIX/osi_file.c
index 556c9596fc4097ec0ec97daefa3551a075c587d4..0a91f9702be9b7d5d504c8351aff850119714fe0 100644 (file)
--- a/src/afs/IRIX/osi_file.c
+++ b/src/afs/IRIX/osi_file.c
@@ -106,7 +106,6 @@ afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat)
     AFS_GLOCK();
     if (code == 0) {
        astat->size = tvattr.va_size;
-       astat->blksize = tvattr.va_blocksize;
        astat->mtime = tvattr.va_mtime.tv_sec;
        astat->atime = tvattr.va_atime.tv_sec;
     }

diff --git a/src/afs/LINUX/osi_file.c b/src/afs/LINUX/osi_file.c
index d23f4de032966930bad39d346bdd7fb949a712c0..67bb39cb82c94b134a2590b1dc1eaa3ee7a20f01 100644 (file)
--- a/src/afs/LINUX/osi_file.c
+++ b/src/afs/LINUX/osi_file.c
@@ -137,9 +137,6 @@ afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat)
     AFS_STATCNT(osi_Stat);
     MObtainWriteLock(&afs_xosi, 320);
     astat->size = OSIFILE_INODE(afile)->i_size;
-#ifdef STRUCT_INODE_HAS_I_BLKSIZE
-    astat->blksize = OSIFILE_INODE(afile)->i_blksize;
-#endif
 #if defined(AFS_LINUX26_ENV)
     astat->mtime = OSIFILE_INODE(afile)->i_mtime.tv_sec;
     astat->atime = OSIFILE_INODE(afile)->i_atime.tv_sec;

diff --git a/src/afs/NBSD/osi_file.c b/src/afs/NBSD/osi_file.c
index 80b42ceab00e9904be024109191957dc2a4df26d..81d58d54a394e69075bd4b2e02acdc5019fdd4b6 100644 (file)
--- a/src/afs/NBSD/osi_file.c
+++ b/src/afs/NBSD/osi_file.c
@@ -67,7 +67,6 @@ afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat)
     AFS_GLOCK();
     if (code == 0) {
        astat->size = tvattr.va_size;
-       astat->blksize = tvattr.va_blocksize;
        astat->mtime = tvattr.va_mtime.tv_sec;
        astat->atime = tvattr.va_atime.tv_sec;
     }

diff --git a/src/afs/OBSD/osi_file.c b/src/afs/OBSD/osi_file.c
index db1f3e7a38b2c3ee3b5a6e3e9515f1aa011301de..b838eee127c8fb7722e8d8805825f1ad10b949e7 100644 (file)
--- a/src/afs/OBSD/osi_file.c
+++ b/src/afs/OBSD/osi_file.c
@@ -72,7 +72,6 @@ afs_osi_Stat(struct osi_file *afile, struct osi_stat *astat)
     AFS_GLOCK();
     if (code == 0) {
        astat->size = afile->size = tvattr.va_size;
-       astat->blksize = tvattr.va_blocksize;
        astat->mtime = tvattr.va_mtime.tv_sec;
        astat->atime = tvattr.va_atime.tv_sec;
     }

diff --git a/src/afs/SOLARIS/osi_file.c b/src/afs/SOLARIS/osi_file.c
index 8316ea29236cd7a6011eaaa22ee0c67cca056c90..05c3e26cea1ba1f7b02c5593845b5bcb084a441c 100644 (file)
--- a/src/afs/SOLARIS/osi_file.c
+++ b/src/afs/SOLARIS/osi_file.c
@@ -228,7 +228,6 @@ afs_osi_Stat(register struct osi_file *afile, register struct osi_stat *astat)
     AFS_GLOCK();
     if (code == 0) {
        astat->size = tvattr.va_size;
-       astat->blksize = tvattr.va_blksize;
        astat->mtime = tvattr.va_mtime.tv_sec;
        astat->atime = tvattr.va_atime.tv_sec;
     }

diff --git a/src/afs/UKERNEL/afs_usrops.c b/src/afs/UKERNEL/afs_usrops.c
index 3445ea40e9b28918d0b2588dcc4df2c4035ab553..40d35fc24b22e6e10e21acc09f19fdb578f66685 100644 (file)
--- a/src/afs/UKERNEL/afs_usrops.c
+++ b/src/afs/UKERNEL/afs_usrops.c
@@ -854,7 +854,6 @@ afs_osi_Stat(struct osi_file *fp, struct osi_stat *stp)
        return -1;
     }
     stp->size = st.st_size;
-    stp->blksize = st.st_blksize;
     stp->mtime = st.st_mtime;
     stp->atime = st.st_atime;
     AFS_GLOCK();

diff --git a/src/afs/afs_osi.h b/src/afs/afs_osi.h
index 36b4c579ccd877a2a0735bc7fbdcddaf976664b4..9eb0a273fcc396e83891f3825af1e899e9dbd988 100644 (file)
--- a/src/afs/afs_osi.h
+++ b/src/afs/afs_osi.h
@@ -41,7 +41,6 @@ struct osi_socket {
 
 struct osi_stat {
     afs_int32 size;            /* file size in bytes */
-    afs_int32 blksize;         /* optimal transfer size in bytes */
     afs_int32 mtime;           /* modification date */
     afs_int32 atime;           /* access time */
 };

diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h
index df31f0f5340281c40bd5dd360e0415a0563868d7..5326c057ee631e72527058d148fea739bfc6afa1 100644 (file)
--- a/src/afs/sysincludes.h
+++ b/src/afs/sysincludes.h
@@ -53,7 +53,9 @@
 #else /* AFS_OBSD_ENV */
 #ifdef AFS_LINUX22_ENV
 #include <linux/version.h>
+#ifdef CONFIG_H_EXISTS
 #include <linux/config.h>
+#endif
 #include <linux/linkage.h>
 #include <linux/limits.h>
 #include <linux/wait.h>