OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_0b-193-g1a86d85

Gerrit Code Review
Thu, 15 Dec 2011 20:33:18 -0800 (PST)

The following commit has been merged in the openafs-stable-1_6_x branch:
commit 1a86d857adbf9b517c58a2770f93f7f1767f5e01
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.
    Reviewed-by: Derrick Brashear <>
    Tested-by: BuildBot <>
    (cherry picked from commit e4059c1b812410bd96481cc60c86c67f8733b66f)
    Change-Id: Ic1d6286bb148f202b8da010edf48fff93a5a48fb
    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