From 9f80c2909ace09cd51c24b49c98a093e0e864dca Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Thu, 5 Feb 2015 11:03:10 +0800 Subject: [PATCH] osdc: clean up code in ObjectCacher::Object::map_write Signed-off-by: Jianpeng Ma --- src/osdc/ObjectCacher.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index 6fafc3b471209..c43fbbd37ff3d 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -379,7 +379,7 @@ ObjectCacher::BufferHead *ObjectCacher::Object::map_write(OSDWrite *wr) if (p->first < cur) { assert(final == 0); - if (cur + max >= p->first + p->second->length()) { + if (cur + max >= bh->end()) { // we want right bit (one splice) final = split(bh, cur); // just split it, take right half. ++p; @@ -393,7 +393,7 @@ ObjectCacher::BufferHead *ObjectCacher::Object::map_write(OSDWrite *wr) } } else { assert(p->first == cur); - if (p->second->length() <= max) { + if (bh->length() <= max) { // whole bufferhead, piece of cake. } else { // we want left bit (one splice) -- 2.39.5