OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-482-ge4059c1

Gerrit Code Review
Thu, 25 Nov 2010 13:19:35 -0800 (PST)

The following commit has been merged in the master branch:
commit e4059c1b812410bd96481cc60c86c67f8733b66f
Author: Andrew Deason <>
Date:   Mon Nov 22 22:23:02 2010 -0500

    vol: Move VOL_CV_TIMEDWAIT to volume_inline.h
    Some platforms will give errors for the vol package glock not being
    defined in VOL_CV_TIMEDWAIT, since some utilities include volume.h
    (with pthreaded ubik enabled) but do not have the vol glock. This
    isn't a problem for the other CV_WAIT (et al) macros, since, being
    macros, they are not expanded if never referenced. Since
    VOL_CV_TIMEDWAIT is a static inline function, however, and at least
    some platforms try to compile/link it even if it's not referenced.
    So, move it to volume_inline.h, which is only used by the volume
    package itself, where we will have the vol glock.
    Change-Id: I3e1513869c03d16d274c23e0bbb075df85d6d3a3
    Reviewed-by: Derrick Brashear <>
    Tested-by: BuildBot <>

 src/vol/volume.h        |   30 ------------------------------
 src/vol/volume_inline.h |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 30 deletions(-)

OpenAFS Master Repository