From: Michael Meffie <mmeffie@sinenomine.net>
Date: Wed, 18 May 2011 17:42:27 +0000 (-0400)
Subject: volinfo: fix -filenames option check
X-Git-Tag: upstream/1.6.0.pre6^2~15
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7cae02dc6dae05aa50cae5e034b3d0fd6fdaa807;p=packages%2Fo%2Fopenafs.git

volinfo: fix -filenames option check

Fix the logic for checking the presense of the volinfo -filenames
option.  The original patch inadvertently added the -filenames
check as an if-else cause to the -orphaned flag check, which
prevents filenames from being printed when listing orphaned
vnodes.

Reviewed-on: http://gerrit.openafs.org/4689
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 33cb8a53fdc8907dafed2e77cc1da539d17397c5)

Change-Id: Ic538976a697317fd3458c8a619f14dd100c4cdab
Reviewed-on: http://gerrit.openafs.org/4697
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/vol/vol-info.c b/src/vol/vol-info.c
index 53e0aa35a..e592cf899 100644
--- a/src/vol/vol-info.c
+++ b/src/vol/vol-info.c
@@ -280,13 +280,14 @@ handleit(struct cmd_syndesc *as, void *arock)
 	orphaned = 1;
 	DumpVnodes = 1;
     } else
+	orphaned = 0;
 #if defined(AFS_NAMEI_ENV)
     if (as->parms[12].items) {
 	PrintFileNames = 1;
 	DumpVnodes = 1;
     } else
+	PrintFileNames = 0;
 #endif
-	orphaned = 0;
 
     DInit(10);