You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2013/07/19 22:24:35 UTC
git commit: TS-954: Fixing original not sufficient commit.
Updated Branches:
refs/heads/master 0850b1235 -> b556188fb
TS-954: Fixing original not sufficient commit.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b556188f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b556188f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b556188f
Branch: refs/heads/master
Commit: b556188fbcea220a179a0761defdaaf6554b4833
Parents: 0850b12
Author: Alan M. Carroll <am...@network-geographics.com>
Authored: Fri Jul 19 15:24:16 2013 -0500
Committer: Alan M. Carroll <am...@network-geographics.com>
Committed: Fri Jul 19 15:24:16 2013 -0500
----------------------------------------------------------------------
iocore/cache/Cache.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b556188f/iocore/cache/Cache.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index 13e46fc..fd91dd4 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -749,7 +749,7 @@ CacheProcessor::start_internal(int flags)
sector_size = STORE_BLOCK_SIZE;
}
off_t skip = ROUND_TO_STORE_BLOCK((sd->offset < START_POS ? START_POS + sd->alignment : sd->offset));
- blocks = blocks - ROUND_TO_STORE_BLOCK(skip);
+ blocks = blocks - (skip >> STORE_BLOCK_SHIFT);
#if AIO_MODE == AIO_MODE_NATIVE
eventProcessor.schedule_imm(NEW(new DiskInit(gdisks[gndisks], path, blocks, skip, sector_size, fd, clear)));
#else