From: Hartmut Reuter <reuter@rzg.mpg.de>
Date: Tue, 8 Oct 2002 05:15:48 +0000 (+0000)
Subject: aix51-support-20020926
X-Git-Tag: openafs-devel-1_3_50~578
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3266003c5dd98c9698498322d33320c715953832;p=packages%2Fo%2Fopenafs.git

aix51-support-20020926


aix 5.1 support, not yet ready for prime-time
---

diff --git a/src/afs/VNOPS/afs_vnop_write.c b/src/afs/VNOPS/afs_vnop_write.c
index ceaab4804..9656dee19 100644
--- a/src/afs/VNOPS/afs_vnop_write.c
+++ b/src/afs/VNOPS/afs_vnop_write.c
@@ -427,8 +427,6 @@ int afs_UFSWrite(register struct vcache *avc, struct uio *auio,
     avc->states |= CDirty;
     tvec = (struct iovec *) osi_AllocSmallSpace(sizeof(struct iovec));
     while (totalLength > 0) {
-#if 0 /* Can't call without tdc. Can't call later since GetDCache can be 
-	 called with !tdc. Leaving it out for now. */
         /* 
          *  The following lines are necessary because afs_GetDCache with
 	 *  flag == 4 expects the length field to be filled. It decides
@@ -436,14 +434,6 @@ int afs_UFSWrite(register struct vcache *avc, struct uio *auio,
 	 *  before writing or not (when the whole chunk is overwritten!).
 	 */
 	len = totalLength;	/* write this amount by default */
-	offset = filePos - AFS_CHUNKTOBASE(tdc->f.chunk);
-	max = AFS_CHUNKTOSIZE(tdc->f.chunk);	/* max size of this chunk */
-	if (max	<= len + offset)	{   /*if we'd go past the end of this chunk */
-	    /* it won't all fit in this chunk, so write as much
-		as will fit */
-	    len = max - offset;
-	}
-#endif
 	/* read the cached info */
 	if (noLock) {
 	    tdc = afs_FindDCache(avc, filePos);
diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h
index f85b22d54..d0843d318 100644
--- a/src/rx/rx_kernel.h
+++ b/src/rx/rx_kernel.h
@@ -42,6 +42,9 @@ typedef struct socket *osi_socket;
 #define	osi_rxSleep(a)	afs_osi_Sleep(a)
 #define	osi_rxWakeup(a)	afs_osi_Wakeup(a)
 #endif /* RX_KERNEL_TRACE */
+#else /* AFS_GLOBAL_SUNLOCK || RX_ENABLE_LOCKS */
+#define	osi_rxSleep(a)	afs_osi_Sleep(a)
+#define	osi_rxWakeup(a)	afs_osi_Wakeup(a)
 #endif
 
 extern int osi_utoa(char *buf, size_t len, unsigned long val);