From 1b95f4e86196a26130ad7fcb1fbd5dc9177c6359 Mon Sep 17 00:00:00 2001 From: Chas Williams Date: Fri, 10 Nov 2006 04:03:38 +0000 Subject: [PATCH] STABLE14-kill-stat-blksize-20061109 FIXES 42663 don't provide a bogus hint (cherry picked from commit 2110d5e843aef69b0753370cd5ad705b5d5afb8e) --- src/afs/AIX/osi_file.c | 1 - src/afs/DARWIN/osi_file.c | 1 - src/afs/FBSD/osi_file.c | 1 - src/afs/HPUX/osi_file.c | 1 - src/afs/IRIX/osi_file.c | 1 - src/afs/LINUX/osi_file.c | 3 --- src/afs/NBSD/osi_file.c | 1 - src/afs/OBSD/osi_file.c | 1 - src/afs/SOLARIS/osi_file.c | 1 - src/afs/UKERNEL/afs_usrops.c | 1 - src/afs/afs_osi.h | 1 - src/afs/sysincludes.h | 2 ++ 12 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/afs/AIX/osi_file.c b/src/afs/AIX/osi_file.c index 2c5c9af50..a25624002 100644 --- 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 c5b4a60cd..279187bef 100644 --- 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 a8099aed0..932e86461 100644 --- 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 81c7c8e42..6b269b220 100644 --- 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 556c9596f..0a91f9702 100644 --- 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 d23f4de03..67bb39cb8 100644 --- 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 80b42ceab..81d58d54a 100644 --- 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 db1f3e7a3..b838eee12 100644 --- 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 8316ea292..05c3e26ce 100644 --- 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 3445ea40e..40d35fc24 100644 --- 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 36b4c579c..9eb0a273f 100644 --- 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 df31f0f53..5326c057e 100644 --- a/src/afs/sysincludes.h +++ b/src/afs/sysincludes.h @@ -53,7 +53,9 @@ #else /* AFS_OBSD_ENV */ #ifdef AFS_LINUX22_ENV #include +#ifdef CONFIG_H_EXISTS #include +#endif #include #include #include -- 2.39.5