From: Andrew Deason <adeason@sinenomine.net>
Date: Tue, 26 Mar 2013 22:00:05 +0000 (-0500)
Subject: volser: Indicate busy volume with VBUSY
X-Git-Tag: upstream/1.8.0_pre1^2~1264
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3929282d2767bd35e54037e5477e917979c84be3;p=packages%2Fo%2Fopenafs.git

volser: Indicate busy volume with VBUSY

Commit 34fc86bcc749f3bd059831b7e5dae03dc09a9393 changed several uses
of VBUSY to VOLSERVOLBUSY in order to detect retriable operations.
However, one such change did not change an Rx abort code, but instead
was used for the 'status' field for a volintInfo or volintXInfo
structure. That is not really a general error code, but a field with a
few specific known values (at least, that is how existing clients
interpret it).

Go back to using VBUSY, so clients indicate the volume as busy,
instead of as offline/unattached.

Reported by Andy Malato.

Change-Id: Ia569633d98266cb15c059e66150d8d7f91d20dca
Reviewed-on: http://gerrit.openafs.org/9678
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
---

diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c
index 17ae45259..c2c2843ef 100644
--- a/src/volser/volprocs.c
+++ b/src/volser/volprocs.c
@@ -2213,7 +2213,7 @@ GetVolInfo(afs_uint32 partId,
     ttc = NewTrans(volumeId, partId);
     if (!ttc) {
 	code = -3;
-	VOLINT_INFO_STORE(handle, status, VOLSERVOLBUSY);
+	VOLINT_INFO_STORE(handle, status, VBUSY);
 	VOLINT_INFO_STORE(handle, volid, volumeId);
 	goto drop;
     }