down with assert, up with osi_Assert

[openafs.git] / src / vol / vnode_inline.h

diff --git a/src/vol/vnode_inline.h b/src/vol/vnode_inline.h
index 506922d..f31c5ca 100644 (file)
--- a/src/vol/vnode_inline.h
+++ b/src/vol/vnode_inline.h
@@ -168,7 +168,7 @@ VnChangeState_r(Vnode * vnp, VnState new_state)
     VnState old_state = Vn_state(vnp);
 
     Vn_state(vnp) = new_state;
-    assert(pthread_cond_broadcast(&Vn_stateCV(vnp)) == 0);
+    CV_BROADCAST(&Vn_stateCV(vnp));
     return old_state;
 }
 
@@ -259,11 +259,11 @@ VnWaitStateChange_r(Vnode * vnp)
 {
     VnState state_save = Vn_state(vnp);
 
-    assert(Vn_refcount(vnp));
+    osi_Assert(Vn_refcount(vnp));
     do {
        VOL_CV_WAIT(&Vn_stateCV(vnp));
     } while (Vn_state(vnp) == state_save);
-    assert(!(Vn_stateFlags(vnp) & VN_ON_LRU));
+    osi_Assert(!(Vn_stateFlags(vnp) & VN_ON_LRU));
 }
 
 /**
@@ -280,11 +280,11 @@ VnWaitStateChange_r(Vnode * vnp)
 static_inline void
 VnWaitExclusiveState_r(Vnode * vnp)
 {
-    assert(Vn_refcount(vnp));
+    osi_Assert(Vn_refcount(vnp));
     while (VnIsExclusiveState(Vn_state(vnp))) {
        VOL_CV_WAIT(&Vn_stateCV(vnp));
     }
-    assert(!(Vn_stateFlags(vnp) & VN_ON_LRU));
+    osi_Assert(!(Vn_stateFlags(vnp) & VN_ON_LRU));
 }
 
 /**
@@ -301,12 +301,12 @@ VnWaitExclusiveState_r(Vnode * vnp)
 static_inline void
 VnWaitQuiescent_r(Vnode * vnp)
 {
-    assert(Vn_refcount(vnp));
+    osi_Assert(Vn_refcount(vnp));
     while (VnIsExclusiveState(Vn_state(vnp)) ||
           Vn_readers(vnp)) {
        VOL_CV_WAIT(&Vn_stateCV(vnp));
     }
-    assert(!(Vn_stateFlags(vnp) & VN_ON_LRU));
+    osi_Assert(!(Vn_stateFlags(vnp) & VN_ON_LRU));
 }
 
 /**
@@ -329,11 +329,11 @@ static_inline void
 VnBeginRead_r(Vnode * vnp)
 {
     if (!Vn_readers(vnp)) {
-       assert(Vn_state(vnp) == VN_STATE_ONLINE);
+       osi_Assert(Vn_state(vnp) == VN_STATE_ONLINE);
        VnChangeState_r(vnp, VN_STATE_READ);
     }
     Vn_readers(vnp)++;
-    assert(Vn_state(vnp) == VN_STATE_READ);
+    osi_Assert(Vn_state(vnp) == VN_STATE_READ);
 }
 
 /**
@@ -356,10 +356,10 @@ VnBeginRead_r(Vnode * vnp)
 static_inline void
 VnEndRead_r(Vnode * vnp)
 {
-    assert(Vn_readers(vnp) > 0);
+    osi_Assert(Vn_readers(vnp) > 0);
     Vn_readers(vnp)--;
     if (!Vn_readers(vnp)) {
-       assert(pthread_cond_broadcast(&Vn_stateCV(vnp)) == 0);
+       CV_BROADCAST(&Vn_stateCV(vnp));
        VnChangeState_r(vnp, VN_STATE_ONLINE);
     }
 }