OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-1123-g89cdb34

Gerrit Code Review
Tue, 26 Apr 2011 17:37:02 -0700 (PDT)

The following commit has been merged in the master branch:
commit 44801d157e6fd0933f37f0fc6451e37bdca285f3
Author: Marc Dionne <>
Date:   Sat Apr 16 14:19:57 2011 -0400

    ubik: always hold DB lock for urecovery_ResetState()
    ubik_ResetState requires callers to hold the DB lock, since it modifies
    urecovery_state.  All callers of ubeacon_AmSyncSite outside of the beacon
    package hold the DB lock, but calls from the beacon thread do not, and
    can't block on getting the DB lock if we're sync site.
    Add a beacon internal version of ubeacon_AmSyncSite that skips the
    call to ResetState, and have the callers take the DB lock and call
    ResetState themselves if needed.  They can take the lock in this case
    because we know we're not the sync site.  Refactor the exported
    ubeacon_AmSyncSite in terms of this new function.
    Change-Id: I88b231010dd52adf6e43a17802e83d12568afc6b
    Reviewed-by: Jeffrey Altman <>
    Tested-by: BuildBot <>
    Reviewed-by: Derrick Brashear <>

 src/ubik/beacon.c |   67 +++++++++++++++++++++++++++++++++-------------------
 1 files changed, 42 insertions(+), 25 deletions(-)

OpenAFS Master Repository