From 861a8762b46c54d7d03fbe9935f9266df8a311fd Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Wed, 19 Dec 2007 20:57:55 +0000 Subject: [PATCH] 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) --- src/afs/VNOPS/afs_vnop_remove.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c index 385e46b019..98ea57f647 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; }