From: Derrick Brashear <shadow@dementia.org>
Date: Thu, 23 Dec 2010 18:20:42 +0000 (-0500)
Subject: DAFS: listvol + unsalvagable volumes = intolerable delay
X-Git-Tag: upstream/1.6.1.pre1^2~60
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d1c329c8f1ea9fc8ef4b360b019c601c1136e41b;p=packages%2Fo%2Fopenafs.git

DAFS: listvol + unsalvagable volumes = intolerable delay

a non- inService volume (or more) plus vos listvol equals pain.
return Salvaging instead of waiting for it in the listvol case.

Reviewed-on: http://gerrit.openafs.org/3588
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit affc978be7ba3c36c9b7a6a94fb5e907beebed99)

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

diff --git a/src/volser/volprocs.c b/src/volser/volprocs.c
index b86501fed..5f4f4937f 100644
--- a/src/volser/volprocs.c
+++ b/src/volser/volprocs.c
@@ -2185,7 +2185,10 @@ GetVolInfo(afs_uint32 partId,
     }
 
     /* Get volume from volserver */
-    tv = VAttachVolumeByName_retry(&error, pname, volname, V_PEEK);
+    if (mode == VOL_INFO_LIST_MULTIPLE)
+	tv = VAttachVolumeByName(&error, pname, volname, V_PEEK);
+    else
+	tv = VAttachVolumeByName_retry(&error, pname, volname, V_PEEK);
     if (error) {
 	Log("1 Volser: GetVolInfo: Could not attach volume %u (%s:%s) error=%d\n",
 	    volumeId, pname, volname, error);