From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 19 Dec 2007 20:57:55 +0000 (+0000)
Subject: DEVEL15-darwin-dont-assert-on-lock-state-in-remove-20071219
X-Git-Tag: openafs-devel-1_5_29~25
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=861a8762b46c54d7d03fbe9935f9266df8a311fd;p=packages%2Fo%2Fopenafs.git

DEVEL15-darwin-dont-assert-on-lock-state-in-remove-20071219

LICENSE IPL10

remove panic due to lock being grabbedin another thread can't be accurately
covered with this test on darwin, as e.g. proc_selfthread() is not in the KPI


(cherry picked from commit f54187bfc59797fe955e779d432d155ab3792022)
---

diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c
index 385e46b01..98ea57f64 100644
--- a/src/afs/VNOPS/afs_vnop_remove.c
+++ b/src/afs/VNOPS/afs_vnop_remove.c
@@ -418,7 +418,11 @@ afs_remove(OSI_VC_ARG(adp), aname, acred)
 	code = afsremove(adp, tdc, tvc, aname, acred, &treq);
     }
     afs_PutFakeStat(&fakestate);
+#ifndef AFS_DARWIN80_ENV
+    /* we can't track by thread, it's not exported in the KPI; only do
+       this on !macos */
     osi_Assert(!WriteLocked(&adp->lock) || (adp->lock.pid_writer != MyPidxx));
+#endif
     return code;
 }