From: Anders Kaseorg <andersk@mit.edu>
Date: Tue, 23 Jul 2013 18:37:26 +0000 (-0400)
Subject: volume_inline.h: Down with assert, again
X-Git-Tag: upstream/1.6.6_pre2^2~123
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6a1c2d4a69471746978a9f2e95d1552f2f8f1a94;p=packages%2Fo%2Fopenafs.git

volume_inline.h: Down with assert, again

Commit 34767c6a0f914960c9a1efabe69dd9c312a2b400 replaced all assert
calls in this file with osi_Assert, but shortly thereafter, commit
db6ee95864a8fc5f33b7e95c19c8ff5058d37e92 added VTimedWaitStateChange_r
with two new assert calls.  These are precarious in a public header;
fix them to osi_Assert like the ones in VWaitStateChange_r.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-on: http://gerrit.openafs.org/10094
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
(cherry picked from commit 30fa9480dd99ed93fa642dd8ce9746760fb42180)

Change-Id: Id0bc0e75de000cf3e4133aaf31f52d9a565c8d9f
Reviewed-on: http://gerrit.openafs.org/10095
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/vol/volume_inline.h b/src/vol/volume_inline.h
index c6df3a510..5610d549e 100644
--- a/src/vol/volume_inline.h
+++ b/src/vol/volume_inline.h
@@ -502,11 +502,11 @@ VTimedWaitStateChange_r(Volume * vp, const struct timespec *ts, int *atimedout)
 
     state_save = V_attachState(vp);
 
-    assert(vp->nWaiters || vp->nUsers);
+    osi_Assert(vp->nWaiters || vp->nUsers);
     do {
 	VOL_CV_TIMEDWAIT(&V_attachCV(vp), ts, &timeout);
     } while (V_attachState(vp) == state_save && !timeout);
-    assert(V_attachState(vp) != VOL_STATE_FREED);
+    osi_Assert(V_attachState(vp) != VOL_STATE_FREED);
 
     if (atimedout && timeout) {
 	*atimedout = 1;