OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-1315-g25688bc

Gerrit Code Review
Tue, 21 Jun 2011 21:57:30 -0700 (PDT)

The following commit has been merged in the master branch:
commit 25688bc2e7e8da83b4bf22d7cdc3e0214eadc455
Author: Andrew Deason <>
Date:   Tue Jun 21 14:58:42 2011 -0500

    vol: Do not overwrite specialStatus in attach2
    attach2 wants to set specialStatus to VBUSY in certain conditions
    (such as, it discovers a conflicting vol op where VVolOpSetVBusy_r is
    true). However, specialStatus may already be set to something else,
    like VMOVED if the volume is being moved off of the server. This can
    happen if the volserver has checked out and FSYNC_VOL_MOVE'd a
    preattached volume but hasn't deleted or checked the volume back in
    So, if specialStatus is already set, don't touch it, so we don't start
    reporting VBUSY errors to clients when we should be reporting VMOVED,
    or some other error code previously set.
    Change-Id: Icb2895036620f186230e1558b8bc04d18cc45c86
    Reviewed-by: Derrick Brashear <>
    Tested-by: BuildBot <>

 src/vol/volume.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

OpenAFS Master Repository