From: Michael Meffie <mmeffie@sinenomine.net>
Date: Sun, 6 Nov 2016 20:31:22 +0000 (-0600)
Subject: dafs: honor salvageserver -salvagedirs
X-Git-Tag: upstream/1.6.20^2~6
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d5f05cce7ffc61a3340509f94388421e3cf2522d;p=packages%2Fo%2Fopenafs.git

dafs: honor salvageserver -salvagedirs

Do not ignore the -salvagedirs option when given to the salvageserver.
When the salvageserver is running with this option, all directories will
be rebuilt by salvages spawned by the dafs salvageserver, including all
demand attach salvages and salvages of individual volumes initiated by
bos salvage.

This does not affect the whole partition salvages initiated by bos
salvage -all.

Reviewed-on: https://gerrit.openafs.org/12456
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Tested-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit 9e66234951cca3ca77e94ab431f739e85017a23a)

Change-Id: I121299a5524cb46a519aead7818b0a7bd2fd4f69
Reviewed-on: https://gerrit.openafs.org/12461
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/vol/salvaged.c b/src/vol/salvaged.c
index cd33dabbf..014fcd38b 100644
--- a/src/vol/salvaged.c
+++ b/src/vol/salvaged.c
@@ -206,6 +206,8 @@ handleit(struct cmd_syndesc *as, void *arock)
 	OKToZap = 1;
     if (as->parms[6].items)	/* -rootinodes */
 	ShowRootFiles = 1;
+    if (as->parms[7].items)	/* -salvagedirs */
+	RebuildDirs = 1;
     if (as->parms[8].items)	/* -ForceReads */
 	forceR = 1;
     if ((ti = as->parms[9].items)) {	/* -Parallel # */