]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Striper: use local variable inside if() that tested it
authorDan Mick <dan.mick@inktank.com>
Sat, 1 Dec 2012 01:21:24 +0000 (17:21 -0800)
committerDan Mick <dan.mick@inktank.com>
Thu, 6 Dec 2012 01:38:05 +0000 (17:38 -0800)
Signed-off-by: Dan Mick <dan.mick@inktank.com>
(cherry picked from commit 917a6f296323164f9d79df94916932722e66fc0a)

src/osdc/Striper.cc

index 26e2b917bb7be5bdf86c8f46c028f835ddd5f4e0..7b5a402893f4d46ab43db486c42f586b12acc9cc 100644 (file)
@@ -284,7 +284,7 @@ void Striper::StripedReadResult::assemble_result(CephContext *cct, bufferlist& b
     size_t len = p->second.first.length();
     if (len < p->second.second) {
       if (zero_tail || bl.length()) {
-       bufferptr bp(p->second.second - p->second.first.length());
+       bufferptr bp(p->second.second - len);
        bp.zero();
        bl.push_front(bp);
        bl.claim_prepend(p->second.first);