From ffaa6a86a320a8b9b06c5b23959fb7d4d0584d0b Mon Sep 17 00:00:00 2001 From: Hartmut Reuter Date: Tue, 19 Dec 2006 04:50:46 +0000 Subject: [PATCH] DEVEL15-volser-dumpstuff-20061218 FIXES 46937 "vos release" per default does an incremental dump. volser-dump-validate-input-20060417 ends up with keeping dead vnodes and data in the remote RO-volume. This patch corrects the behavior for RO-volumes. See ticket for extensive discussion. (cherry picked from commit 7a2d34be17d3ea1a24ab1362698de212c7d8008d) --- src/volser/dumpstuff.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c index cd8f252d7..f39f158b2 100644 --- a/src/volser/dumpstuff.c +++ b/src/volser/dumpstuff.c @@ -1035,12 +1035,15 @@ RestoreVolume(register struct rx_call *call, Volume * avp, int incremental, struct iod iod; register struct iod *iodp = &iod; afs_int32 *b1 = NULL, *b2 = NULL; - int s1 = 0, s2 = 0, delo = incremental, tdelo; + int s1 = 0, s2 = 0, delo = 0, tdelo; int tag; iod_Init(iodp, call); vp = avp; + if (V_parentId(vp) == V_id(vp)) + delo = incremental; + if (!ReadDumpHeader(iodp, &header)) { Log("1 Volser: RestoreVolume: Error reading header file for dump; aborted\n"); return VOLSERREAD_DUMPERROR; -- 2.39.5