From d1c329c8f1ea9fc8ef4b360b019c601c1136e41b Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Thu, 23 Dec 2010 13:20:42 -0500 Subject: [PATCH] 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 Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear (cherry picked from commit affc978be7ba3c36c9b7a6a94fb5e907beebed99) Change-Id: If871ce0cdd3593250f22d74de184f92b046b5f6e Reviewed-on: http://gerrit.openafs.org/6270 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/volser/volprocs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); -- 2.39.5