From: Andrew Deason <adeason@sinenomine.net>
Date: Wed, 2 May 2012 17:07:49 +0000 (-0500)
Subject: vol: Pay attention to specialStatus after VAVByVp
X-Git-Tag: upstream/1.6.2_pre2^2~177
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=29102b48c1c7224be8479f23605706e6fb3df65a;p=packages%2Fo%2Fopenafs.git

vol: Pay attention to specialStatus after VAVByVp

attach2/VAttachVolumeByVp_r do not alter the yielded error code
according to specialStatus. So, pay attention to specialStatus after
receiving an error from VAttachVolumeByVp_r, to ensure we respond with
the correct error code.

Reviewed-on: http://gerrit.openafs.org/7303
Reviewed-by: Tom Keiser <tkeiser@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit a81f9237bfa7b2e3a0567a930f3c49234b9a4376)

Change-Id: I1d0cb429b9cd875fa43a3af2e8c5d5d96ee12f85
Reviewed-on: http://gerrit.openafs.org/7491
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/vol/volume.c b/src/vol/volume.c
index 9aa4a4fe5..8599c59de 100644
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -4044,9 +4044,17 @@ GetVolume(Error * ec, Error * client_ec, VolId volumeId, Volume * hint,
 		    if (!vp->pending_vol_op) {
 			endloop = 1;
 		    }
+		    if (vp->specialStatus) {
+			*ec = vp->specialStatus;
+		    }
 		    break;
+
 		default:
-		    *ec = VNOVOL;
+		    if (vp->specialStatus) {
+			*ec = vp->specialStatus;
+		    } else {
+			*ec = VNOVOL;
+		    }
 		    endloop = 1;
 		}
 		if (endloop) {