From 56218cab39d522cb6911620bbf34d0236bfd3052 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Wed, 28 Jul 2010 12:01:01 -0500 Subject: [PATCH] salvage: Do not look at not-found root dir If we have not found any root directory, don't even look at 'oldrootdir' or 'rootdir', since they will be uninitialized at this point. Change-Id: Ia1a7037e06a223a7e1fbc48c0bfadd3b7aaa0e4b Reviewed-on: http://gerrit.openafs.org/2528 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/vol/vol-salvage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c index f9c07c8c12..ccf34296c5 100644 --- a/src/vol/vol-salvage.c +++ b/src/vol/vol-salvage.c @@ -3908,7 +3908,7 @@ SalvageVolume(register struct InodeSummary *rwIsp, IHandle_t * alinkH) /* Delete the old rootinode directory if the rootdir was CopyOnWrite */ DFlush(); - if (!oldrootdir.copied && rootdir.copied) { + if (rootdirfound && !oldrootdir.copied && rootdir.copied) { code = IH_DEC(oldrootdir.ds_linkH, oldrootdir.dirHandle.dirh_inode, oldrootdir.rwVid);