From: Andrew Deason Date: Fri, 14 Oct 2011 16:32:34 +0000 (-0500) Subject: vos offline: Bring volume back online for -busy X-Git-Tag: upstream/1.8.0_pre1^2~3144 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8c7202fb9ea9cf5e5c888000ec84fd9b7478068d;p=packages%2Fo%2Fopenafs.git 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. Change-Id: I6e605771fcfcabbb09f6dcfd0576c062f64ad93f Reviewed-on: http://gerrit.openafs.org/5620 Reviewed-by: Derrick Brashear Tested-by: BuildBot --- diff --git a/src/volser/vos.c b/src/volser/vos.c index a8cbe418e..38c5aa6a1 100644 --- a/src/volser/vos.c +++ b/src/volser/vos.c @@ -1881,7 +1881,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;