From 1092cbe34fc8519826b3fa0565505b7bd81bc922 Mon Sep 17 00:00:00 2001 From: Mark Vitale Date: Thu, 7 Mar 2013 09:34:55 -0500 Subject: [PATCH] vos: noise messages when attempting to delete non-existent volume With vos refactor commit f4e73067cdef990262c69c38ac98761620a63f25, some formerly conditional volume deletes are now unconditional. This regresses 'vos move' output with harmless "error" messages when AFSVolTransCreate() returns VNOVOL: "Failed to start transaction on " "Volume not attached, does not exist, or not online" Modify DoVolDelete() to return early (and silently) with VNOVOL in this case, allowing the caller to handle this appropriately. Change-Id: I21a72e38f330335adf97ac50a7ac7d0fb97c1a9c Reviewed-on: http://gerrit.openafs.org/9596 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Reviewed-by: Derrick Brashear --- src/volser/vsprocs.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c index 043aa42b55..aa25d4329f 100644 --- a/src/volser/vsprocs.c +++ b/src/volser/vsprocs.c @@ -1171,6 +1171,12 @@ DoVolDelete(struct rx_connection *aconn, afs_uint32 avolid, code = AFSVolTransCreate_retry(aconn, avolid, apart, ITOffline, &ttid); + /* return early and quietly for VNOVOL; don't continue the attempt to delete. */ + if (code == VNOVOL) { + error = code; + goto dfail; + } + EGOTO2(dfail, code, "%sFailed to start transaction on %u\n", prefix, avolid);