From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 28 Jan 2009 22:39:13 +0000 (+0000)
Subject: DEVEL15-discon-remove-fix-20090128
X-Git-Tag: openafs-devel-1_5_58~165
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=aa7be50728c8d044f9734b5f05df8481aee8330a;p=packages%2Fo%2Fopenafs.git

DEVEL15-discon-remove-fix-20090128

LICENSE IPL10

fix my own error


(cherry picked from commit df139845e9f83cd15f3b0ab8dcbb27781c811642)
---

diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c
index c358c29ec..14ee0537a 100644
--- a/src/afs/VNOPS/afs_vnop_remove.c
+++ b/src/afs/VNOPS/afs_vnop_remove.c
@@ -446,12 +446,14 @@ afs_remove(OSI_VC_DECL(adp), char *aname, struct AFS_UCRED *acred)
 	    }
 	    tvc->uncred = acred;
 	    tvc->f.states |= CUnlinked;
+#if defined(AFS_DISCON_ENV)
 	    /* if rename succeeded, remove should not */
 	    ObtainWriteLock(&tvc->lock, 715);
 	    if (tvc->f.ddirty_flags & VDisconRemove) {
 		tvc->f.ddirty_flags &= ~VDisconRemove;
 	    }
 	    ReleaseWriteLock(&tvc->lock);
+#endif
 	} else {
 	    osi_FreeSmallSpace(unlname);
 	}