From: Marc Dionne <marc.c.dionne@gmail.com>
Date: Thu, 19 Mar 2009 03:53:42 +0000 (+0000)
Subject: DEVEL15-discon-ifdef-cleanup-20090318
X-Git-Tag: openafs-devel-1_5_58~58
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b1f98c9b32f4b864f7e97c1ffa2189ceae32e7fb;p=packages%2Fo%2Fopenafs.git

DEVEL15-discon-ifdef-cleanup-20090318

LICENSE IPL10
FIXES 124508

fix the disconnected ifdefs


(cherry picked from commit 156f1b8e4a3607a49de45ca43a52f42a21cdaab8)
---

diff --git a/src/afs/VNOPS/afs_vnop_dirops.c b/src/afs/VNOPS/afs_vnop_dirops.c
index 6b35d5b2e..be99cc96c 100644
--- a/src/afs/VNOPS/afs_vnop_dirops.c
+++ b/src/afs/VNOPS/afs_vnop_dirops.c
@@ -457,7 +457,7 @@ afs_rmdir(OSI_VC_DECL(adp), char *aname, struct AFS_UCRED *acred)
     if (tvc) {
 	ObtainWriteLock(&tvc->lock, 155);
 	tvc->f.states &= ~CUnique;	/* For the dfs xlator */
-#if AFS_DISCON_ENV
+#if defined(AFS_DISCON_ENV)
 	if (AFS_IS_DISCON_RW) {
 	    if (tvc->f.ddirty_flags & VDisconCreate) {
 		/* If we we were created whilst disconnected, removal doesn't
diff --git a/src/afs/VNOPS/afs_vnop_write.c b/src/afs/VNOPS/afs_vnop_write.c
index b9f650cc1..39685a674 100644
--- a/src/afs/VNOPS/afs_vnop_write.c
+++ b/src/afs/VNOPS/afs_vnop_write.c
@@ -264,7 +264,7 @@ afs_MemWrite(register struct vcache *avc, struct uio *auio, int aio,
 	osi_Assert(filePos <= avc->f.m.Length);
 #else
 	if (filePos > avc->f.m.Length) {
-#if AFS_DISCON_ENV
+#if defined(AFS_DISCON_ENV)
 	    if (AFS_IS_DISCON_RW)
    		afs_PopulateDCache(avc, filePos, &treq);
 #endif
@@ -576,10 +576,10 @@ afs_UFSWrite(register struct vcache *avc, struct uio *auio, int aio,
 	osi_Assert(filePos <= avc->f.m.Length);
 #else
 	if (filePos > avc->f.m.Length) {
-# ifdef AFS_DISCON_ENV
+#if defined(AFS_DISCON_ENV)
 	    if (AFS_IS_DISCON_RW)
 		afs_PopulateDCache(avc, filePos, &treq);
-# endif
+#endif
 	    afs_Trace4(afs_iclSetp, CM_TRACE_SETLENGTH, ICL_TYPE_STRING,
 		       __FILE__, ICL_TYPE_LONG, __LINE__, ICL_TYPE_OFFSET,
 		       ICL_HANDLE_OFFSET(avc->f.m.Length), ICL_TYPE_OFFSET,