From: Derrick Brashear <shadow@dementix.org>
Date: Tue, 13 Sep 2011 19:27:37 +0000 (-0400)
Subject: volser: dont double-stat vnodes when dumping
X-Git-Tag: upstream/1.8.0_pre1^2~3285
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6c18c8844f3be6e006c7f59b3cc36f5b1688e04f;p=packages%2Fo%2Fopenafs.git

volser: dont double-stat vnodes when dumping

we get the size, then we get it again. no clue why. let's just not.

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

diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c
index 702363be3..16f5e7921 100644
--- a/src/volser/dumpstuff.c
+++ b/src/volser/dumpstuff.c
@@ -705,7 +705,6 @@ DumpFile(struct iod *iodp, int vnode, FdHandle_t * handleP)
 #ifndef AFS_NT40_ENV
     struct afs_stat status;
 #endif
-    afs_sfsize_t size;
 #ifdef	AFS_AIX_ENV
 #include <sys/statfs.h>
 #if defined(AFS_AIX52_ENV)
@@ -744,8 +743,7 @@ DumpFile(struct iod *iodp, int vnode, FdHandle_t * handleP)
 #endif /* AFS_NT40_ENV */
 
 
-    size = FDH_SIZE(handleP);
-    SplitInt64(size, hi, lo);
+    SplitInt64(howBig, hi, lo);
     if (hi == 0L) {
 	code = DumpInt32(iodp, 'f', lo);
     } else {
@@ -761,7 +759,7 @@ DumpFile(struct iod *iodp, int vnode, FdHandle_t * handleP)
 	return VOLSERDUMPERROR;
     }
 
-    for (nbytes = size; (nbytes && !error); nbytes -= howMany) {
+    for (nbytes = howBig; (nbytes && !error); nbytes -= howMany) {
 	if (nbytes < howMany)
 	    howMany = nbytes;
 
@@ -801,7 +799,7 @@ DumpFile(struct iod *iodp, int vnode, FdHandle_t * handleP)
 	    /* Now seek over the data we could not get. An error here means we
 	     * can't do the next read.
 	     */
-	    howFar = (size_t)((size - nbytes) + howMany);
+	    howFar = (size_t)((howBig - nbytes) + howMany);
 	}
 
 	/* Now write the data out */