OpenAFS Master Repository branch, openafs-devel-1_7_x, updated. openafs-devel-1_7_1-70-g6f730bc
Gerrit Code Review
gerrit@openafs.org
Sat, 12 Nov 2011 15:52:38 -0800 (PST)
The following commit has been merged in the openafs-devel-1_7_x branch:
commit 6f730bcdadb7f78a0b44e451b1725a7aa699abaf
Author: Andrew Deason <adeason@sinenomine.net>
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: I1fcd0f52821ac813d57ecac2f743edd4474727b1
Reviewed-on: http://gerrit.openafs.org/5645
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
(cherry-picked from dd831c09602f1ef16cc7dece84aeff638cce7272)
Reviewed-on: http://gerrit.openafs.org/5900
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
src/viced/afsfileprocs.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
--
OpenAFS Master Repository