OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-695-g962a95c

Gerrit Code Review
Wed, 26 Jan 2011 19:04:58 -0800 (PST)

The following commit has been merged in the master branch:
commit 962a95c21cc82a8bbb1dc1233c91acd7236fc8e4
Author: Jeffrey Altman <>
Date:   Wed Jan 26 20:10:57 2011 -0500

    Windows: Correct cm_volume locking
    cm_volume_t flags was used for two categories of flags.  The first
    protected by the cm_volume_t->rw lock.  The second protected by
    the global cm_volumeLock.  Separate the flags field into two
    afs_uint16 fields and break the flag space into FLAG and QFLAG.
    Add assertions to the volume LRU functions to ensure that they
    are always called with cm_volumeLock write-locked.
    Correct two locations where cm_AdjustVolumeLRU() was called
    read-locked instead of write-locked.
    Change-Id: I7991b995a3c981cd5d08d9cbba09badc81518a5a
    Tested-by: BuildBot <>
    Reviewed-by: Jeffrey Altman <>
    Tested-by: Jeffrey Altman <>

 src/WINNT/afsd/cm_memmap.h |    2 +-
 src/WINNT/afsd/cm_volume.c |   78 +++++++++++++++++++++++++------------------
 src/WINNT/afsd/cm_volume.h |   11 ++++--
 3 files changed, 53 insertions(+), 38 deletions(-)

OpenAFS Master Repository