From b33db8c7dee9ecf397d943fbc56cdf70dda5198e Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Fri, 14 Oct 2011 11:32:34 -0500 Subject: [PATCH] vos offline: Bring volume back online for -busy vos offline is supposed to bring a volume back online from "busy" status before exiting, as volumes should not be in "busy" status for extended periods of time. This was being enforced by required that -sleep be specified; however, -sleep only results in the volume being brought back online if a non-zero sleep time was specified. So, make sure the volume is brought back online if -busy was specified. Reviewed-on: http://gerrit.openafs.org/5620 Reviewed-by: Derrick Brashear Tested-by: BuildBot (cherry picked from commit 8c7202fb9ea9cf5e5c888000ec84fd9b7478068d) Change-Id: I64aa6f297b787ca666959ff4f35d17aced6e41a7 Reviewed-on: http://gerrit.openafs.org/5718 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/volser/vos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/volser/vos.c b/src/volser/vos.c index 1f95d8553..50e2c0085 100644 --- a/src/volser/vos.c +++ b/src/volser/vos.c @@ -1901,7 +1901,7 @@ volOffline(struct cmd_syndesc *as, void *arock) transflag = (as->parms[4].items ? ITBusy : ITOffline); sleeptime = (as->parms[3].items ? atol(as->parms[3].items->data) : 0); - transdone = (sleeptime ? 0 /*online */ : VTOutOfService); + transdone = ((sleeptime || as->parms[4].items) ? 0 /*online */ : VTOutOfService); if (as->parms[4].items && !as->parms[3].items) { fprintf(STDERR, "-sleep option must be used with -busy flag\n"); return -1; -- 2.39.5