From: Hartmut Reuter <reuter@rzg.mpg.de>
Date: Mon, 10 Mar 2014 16:21:21 +0000 (+0100)
Subject: volser: use also vn_length_hi in dump size calculation
X-Git-Tag: upstream/1.6.8^2~15
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c24dd7dc74e35cbc79b572eafe2fd47c9108c478;p=packages%2Fo%2Fopenafs.git

volser: use also vn_length_hi in dump size calculation

Only the low order 32 bits of the file length were used.
Now using macro VNDISK_GET_LEN instead of direct FillInt64.

FIXES 131819

Reviewed-on: http://gerrit.openafs.org/10876
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 705f3ee384814bc082817267a2658bd5c918550c)

Change-Id: I1816e4b7c5fe1166ac81ff53235f9f676f4d234f
Reviewed-on: http://gerrit.openafs.org/10933
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: D Brashear <shadow@your-file-system.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/volser/dumpstuff.c b/src/volser/dumpstuff.c
index c835e0142..23c799efd 100644
--- a/src/volser/dumpstuff.c
+++ b/src/volser/dumpstuff.c
@@ -1847,7 +1847,11 @@ SizeDumpVnode(struct iod *iodp, struct VnodeDiskObject *v, int volid,
     }
 
     if (VNDISK_GET_INO(v)) {
-	FillInt64(addvar,0, (v->length + 5));
+	VNDISK_GET_LEN(addvar, v);
+	if (v->vn_length_hi)
+	    addvar += 9;
+	else
+	    addvar += 5;
 	AddUInt64(v_size->dump_size, addvar, &v_size->dump_size);
     }
     return code;