From ae7ea148390fb2b41bfa7437e97ea55a099abb5f Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Fri, 22 Feb 2013 16:54:17 +0000 Subject: [PATCH] Unix CM: Fix byte accounting for storebehind In the current version of CacheStoreDCaches, the stored variable is maintained within the for loop that iterates over the chunk list. This means that it is reset to 0 each time we handle a new chunk. However, this means that our progress is no longer accurately tracked, as (bytes - stored) no longer gives the number of bytes which remain to be transfered. In fact, as stored is zeroed with each loop iteration, (bytes - stored) == bytes. This means that store behind is no longer activated according to the users settings. Prior to commit 334114ac58b0039ae90d7e29fa2f019fe068bd79, the stored variable was maintained within the outer, function, scope. Just move it back there to restore the previous behaviour. Caught by clang-analyzer Reviewed-on: http://gerrit.openafs.org/9237 Tested-by: BuildBot Reviewed-by: Derrick Brashear (cherry picked from commit 5acb1a0f323a6692cca66ee3aa4c7e5f1a0f24f2) Change-Id: I22c60b07ba9518d5714c65b1952a35214f690433 Reviewed-on: http://gerrit.openafs.org/9530 Tested-by: BuildBot Reviewed-by: Derrick Brashear Reviewed-by: Andrew Deason Reviewed-by: Stephan Wiesand --- src/afs/afs_fetchstore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/afs/afs_fetchstore.c b/src/afs/afs_fetchstore.c index 6746f1b4f..c05389c1f 100644 --- a/src/afs/afs_fetchstore.c +++ b/src/afs/afs_fetchstore.c @@ -463,6 +463,7 @@ afs_CacheStoreDCaches(struct vcache *avc, struct dcache **dclist, { int *shouldwake = NULL; unsigned int i; + int stored = 0; afs_int32 code = 0; afs_size_t bytesXferred; @@ -473,7 +474,6 @@ afs_CacheStoreDCaches(struct vcache *avc, struct dcache **dclist, XSTATS_DECLS; for (i = 0; i < nchunks && !code; i++) { - int stored = 0; struct dcache *tdc = dclist[i]; afs_int32 size = tdc->f.chunkBytes; if (!tdc) { -- 2.39.5