From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Aug 2015 18:57:47 +0000 (-0400)
Subject: os/newstore: fix collection range for temp objects
X-Git-Tag: v9.1.0~242^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1f0bdb0bd2d9b862456cba0900822f1d3c8dc97;p=ceph.git

os/newstore: fix collection range for temp objects

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/newstore/NewStore.cc b/src/os/newstore/NewStore.cc
index 1b3790f9ca20..a198d2ae103f 100644
--- a/src/os/newstore/NewStore.cc
+++ b/src/os/newstore/NewStore.cc
@@ -154,7 +154,7 @@ static void get_coll_key_range(const coll_t& cid, int bits,
 	     (unsigned)hobject_t::_reverse_bits(pgid.ps()));
     start->append(buf);
     snprintf(buf, sizeof(buf), ".%016llx.%08x.",
-	     (unsigned long long)((-1ll - pgid.pool()) + 0x8000000000000000ull),
+	     (unsigned long long)((-2ll - pgid.pool()) + 0x8000000000000000ull),
 	     (unsigned)hobject_t::_reverse_bits(pgid.ps()));
     temp_start->append(buf);
 
@@ -165,7 +165,7 @@ static void get_coll_key_range(const coll_t& cid, int bits,
 	       (unsigned long long)(pgid.pool() + 0x8000000000000000ull));
       end->append(buf);
       snprintf(buf, sizeof(buf), ".%016llx.gggggggg.",
-	       (unsigned long long)((-1ll - pgid.pool()) + 0x8000000000000000ull));
+	       (unsigned long long)((-2ll - pgid.pool()) + 0x8000000000000000ull));
       temp_end->append(buf);
     } else {
       snprintf(buf, sizeof(buf), ".%016llx.%08x.",
@@ -173,7 +173,7 @@ static void get_coll_key_range(const coll_t& cid, int bits,
 	       (unsigned)end_hash);
       end->append(buf);
       snprintf(buf, sizeof(buf), ".%016llx.%08x.",
-	       (unsigned long long)((-1ll - pgid.pool()) + 0x8000000000000000ull),
+	       (unsigned long long)((-2ll - pgid.pool()) + 0x8000000000000000ull),
 	       (unsigned)end_hash);
       temp_end->append(buf);
     }