volinfo: fix volume aux totals output

Do not print the volumes aux totals prematurely when running
volinfo with the -headers flag on an namei fileserver. Instead
print the aux totals only once after the link table size is found.

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

Change-Id: I6e059a070785fb44821827a75397d04c8669418d
Reviewed-on: http://gerrit.openafs.org/11247
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/src/vol/vol-info.c b/src/vol/vol-info.c
index 19ae86bdfc7a202580773172793125caf4d17ed5..a8e37a91116a9d9edd572ffcb152f82eaa9c929f 100644 (file)
--- a/src/vol/vol-info.c
+++ b/src/vol/vol-info.c
@@ -580,9 +580,6 @@ HandleVolume(struct DiskPartition64 *dp, char *name)
            if (!dsizeOnly && !saveinodes) {
                printf("\tLarge inode\t= %s (size = %d)\n",
                       PrintInode(NULL, header.largeVnodeIndex), (int)code);
-#ifndef AFS_NT40_ENV
-               printf("Total aux volume size = %d\n\n", (int)size);
-#endif
            }
 #ifdef AFS_NAMEI_ENV
            IH_INIT(ih, dp->device, header.parent, header.linkTable);
@@ -607,9 +604,9 @@ HandleVolume(struct DiskPartition64 *dp, char *name)
            if (!dsizeOnly && !saveinodes) {
                printf("\tLink inode\t= %s (size = %d)\n",
                       PrintInode(NULL, header.linkTable), (int)code);
-               printf("Total aux volume size = %d\n\n", (int)size);
            }
 #endif
+           printf("Total aux volume size = %d\n\n", (int)size);
            Vauxsize = size;
            Vauxsize_k = size / 1024;
        }