jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-21 08:20:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vol: A GOING_OFFLINE volume should yield VOFFLINE

Browse Source 
Currently, GetVolume treats a volume in the VOL_STATE_GOING_OFFLINE
state the same as VOL_STATE_SHUTTING_DOWN, and so returns VNOVOL for a
GOING_OFFLINE volume, but these states are very different.

GOING_OFFLINE indicates that a volume should soon be in the UNATTACHED
state, so we should treat GOING_OFFLINE the same as UNATTACHED for
returning errors to the user. For UNATTACHED, we return specialStatus
if it's set, or VOFFLINE otherwise; so, just do the same for
GOING_OFFLINE.

Change-Id: Ia9500d2cfd90b8c15782a06025f39298810d0a99
Reviewed-on: http://gerrit.openafs.org/7290
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
This commit is contained in:
Andrew Deason 2012-04-27 12:59:25 -05:00 committed by Derrick Brashear
parent 868378cc00
commit d10f71d44f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/vol/volume.c
View File

@ -4044,18 +4044,18 @@ GetVolume(Error * ec, Error * client_ec, VolId volumeId, Volume * hint,
* - VOL_STATE_SHUTTING_DOWN * - VOL_STATE_SHUTTING_DOWN
*/ */
if ((V_attachState(vp) == VOL_STATE_ERROR) || if ((V_attachState(vp) == VOL_STATE_ERROR) ||
(V_attachState(vp) == VOL_STATE_SHUTTING_DOWN) || (V_attachState(vp) == VOL_STATE_SHUTTING_DOWN)) {
(V_attachState(vp) == VOL_STATE_GOING_OFFLINE)) {
*ec = VNOVOL; *ec = VNOVOL;
vp = NULL; vp = NULL;
break; break;
} }
/* /*
* short circuit with VOFFLINE for VOL_STATE_UNATTACHED and * short circuit with VOFFLINE for VOL_STATE_UNATTACHED/GOING_OFFLINE and
* VNOVOL for VOL_STATE_DELETED * VNOVOL for VOL_STATE_DELETED
*/ */
if ((V_attachState(vp) == VOL_STATE_UNATTACHED) || if ((V_attachState(vp) == VOL_STATE_UNATTACHED) ||
(V_attachState(vp) == VOL_STATE_GOING_OFFLINE) ||
(V_attachState(vp) == VOL_STATE_DELETED)) { (V_attachState(vp) == VOL_STATE_DELETED)) {
if (vp->specialStatus) { if (vp->specialStatus) {
*ec = vp->specialStatus; *ec = vp->specialStatus;