OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_0b-74-gd1711ef

Gerrit Code Review
Wed, 26 Oct 2011 15:52:48 -0700 (PDT)

The following commit has been merged in the openafs-stable-1_6_x branch:
commit d1711efd73b8dea177672eeb477a23d4a83b95b7
Author: Andrew Deason <>
Date:   Thu Oct 20 16:57:14 2011 -0500

    viced: Do not swallow errors on StoreData recovery
    When we encounter any error in the StoreData fetch/store loop, we
    reset the disk usage to ensure it remains correct, even in the face of
    unexpected errors. However, when we do so, we use the errorCode from
    VAdjustDiskUsage as our return value; if it is 0, we return success,
    ignoring the error that got us in this code path in the first place.
    Instead, keep track of a temporary errorCode for the disk usage
    adjustment, and do not override our return value if there was no error
    in the disk usage numbers.
    Reviewed-by: Derrick Brashear <>
    Tested-by: Derrick Brashear <>
    (cherry picked from commit dd831c09602f1ef16cc7dece84aeff638cce7272)
    Change-Id: I154e6cbc96ee4e32bee2da77441547c1dce8b42c
    Reviewed-by: Derrick Brashear <>
    Tested-by: Derrick Brashear <>

 src/viced/afsfileprocs.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

OpenAFS Master Repository