OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-1766-gdd831c0

Gerrit Code Review
Sun, 23 Oct 2011 16:19:49 -0700 (PDT)

The following commit has been merged in the master branch:
commit dd831c09602f1ef16cc7dece84aeff638cce7272
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.
    Change-Id: Ifbe2377f2750b508d48e535215be3583d1d78e65
    Reviewed-by: Derrick Brashear <>
    Tested-by: Derrick Brashear <>

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

OpenAFS Master Repository