OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-devel-1_5_77-138-gc5b516c

Gerrit Code Review
Wed, 3 Nov 2010 03:48:12 -0700 (PDT)

The following commit has been merged in the openafs-stable-1_6_x branch:
commit ccc14955235dbf7d8f1244f6204aa34ba99a2d53
Author: Andrew Deason <>
Date:   Fri Jul 2 16:57:42 2010 -0500

    DAFS: Fix demand-salvages of attached volumes
    Currently, when an error is encountered for an attached volume, we
    call VRequestSalvage_r, which makes the volume go into the
    VOL_STATE_SALVAGING state. This state implies that the volume is
    offline, however, which is not necessarily the case if we're calling
    VRequestSalvage_r from, for example, VAllocVnode_r or VUpdateVolume_r.
    So now, make a new state called VOL_STATE_SALVAGE_REQ to indicate when
    a salvage has been requested but the volume is not offline yet (and
    thus is not yet ready to give to the salvager). If VCheckSalvage finds
    a volume in this state, it offlines the volume first. The FSSYNC
    VOL_OFF handler now checks for this state, and if we're giving the
    volume to the salvager, we wait for the volume to exit that state.
    VRequestSalvage_r also gains a new flag, VOL_SALVAGE_NO_OFFLINE. This
    is to ensure that the existing salvaging code paths for unattached
    volumes does not change (for when VRequesetSalvage_r is called from
    attach2). If this flag is passed, we do what we used to do, which is
    just salvage the volume without offlining it.
    Tested-by: BuildBot <>
    Tested-by: Derrick Brashear <>
    Reviewed-by: Derrick Brashear <>
    (cherry picked from commit 0aa7fac246ce044c757530ebe96d3a05c2f33894)
    Change-Id: I76db861c862789801d74578c4965a2bc41c2047b

 src/vol/fssync-debug.c  |    1 +
 src/vol/fssync-server.c |   14 ++++-
 src/vol/volume.c        |  129 ++++++++++++++++++++++++++++++++++++++++++-----
 src/vol/volume.h        |   15 ++++-
 src/vol/volume_inline.h |   32 ++++++++++++
 5 files changed, 172 insertions(+), 19 deletions(-)

OpenAFS Master Repository