From e2a22edd2a2cb4f5f7d31bcbb591daf1b4c4ca6d Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sun, 23 Oct 2005 07:31:23 +0000 Subject: [PATCH] STABLE14-vnop-attrs-fix-20051023 FIXES 22568 fix code broken in mac merge (cherry picked from commit e6e293bb899cb027648908d23848ce13901a7503) --- src/afs/VNOPS/afs_vnop_attrs.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c index c1812334d0..23d813797d 100644 --- a/src/afs/VNOPS/afs_vnop_attrs.c +++ b/src/afs/VNOPS/afs_vnop_attrs.c @@ -158,20 +158,20 @@ afs_CopyOutAttrs(register struct vcache *avc, register struct vattr *attrs) * Below return 0 (and not 1) blocks if the file is zero length. This conforms * better with the other filesystems that do return 0. */ -#ifdef AFS_HPUX_ENV - attrs->va_blocks = (attrs->va_size ? ((attrs->va_size + 1023) >> 10) : 0); -#elif defined(AFS_SGI_ENV) - attrs->va_blocks = BTOBB(attrs->va_size); -#elif defined(AFS_XBSD_ENV) || defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) +#if defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV) attrs->va_bytes = (attrs->va_size ? (attrs->va_size + 1023) : 1024); #ifdef va_bytes_rsv attrs->va_bytes_rsv = -1; #endif -#else - attrs->va_blocks = - (attrs->va_size ? ((attrs->va_size + 1023) >> 10) << 1 : 0); +#elif defined(AFS_HPUX_ENV) + attrs->va_blocks = (attrs->va_size ? ((attrs->va_size + 1023)>>10) : 0); +#elif defined(AFS_SGI_ENV) + attrs->va_blocks = BTOBB(attrs->va_size); +#elif defined(AFS_SUN5_ENV) + attrs->va_nblocks = (attrs->va_size ? ((attrs->va_size + 1023)>>10)<<1:0); +#else /* everything else */ + attrs->va_blocks = (attrs->va_size ? ((attrs->va_size + 1023)>>10)<<1:0); #endif - return 0; }