jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

volume_inline.h: Down with assert, again

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

Change-Id: If2055355b45a09940d69dace59ec18bd6a0cc6fa
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>
This commit is contained in:
Anders Kaseorg 2013-07-23 14:37:26 -04:00 committed by Derrick Brashear
parent 8b5d3a73f9
commit 30fa9480dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vol/volume_inline.h
View File

@ -505,11 +505,11 @@ VTimedWaitStateChange_r(Volume * vp, const struct timespec *ts, int *atimedout)
state_save = V_attachState(vp);
assert(vp->nWaiters || vp->nUsers);
opr_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);
opr_Assert(V_attachState(vp) != VOL_STATE_FREED);
if (atimedout && timeout) {
*atimedout = 1;