From: Sage Weil <sage@redhat.com>
Date: Fri, 26 Feb 2016 16:25:44 +0000 (-0500)
Subject: osd/ScrubStore: do not use temp collection
X-Git-Tag: v10.1.0~113^2~12
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6a60c12e589bdbdcad197192a0c0fc5bc74ab1fd;p=ceph.git

osd/ScrubStore: do not use temp collection

Temp collections are deprecated, and used only internally by
FileStore for compat reasons.

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

diff --git a/src/osd/ScrubStore.cc b/src/osd/ScrubStore.cc
index 84865c1e4b68a..45571892886c4 100644
--- a/src/osd/ScrubStore.cc
+++ b/src/osd/ScrubStore.cc
@@ -102,9 +102,8 @@ Store::create(ObjectStore* store,
   assert(store);
   assert(t);
   hobject_t oid = make_scrub_object(pgid);
-  coll_t temp_coll = coll.get_temp();
-  t->touch(temp_coll, ghobject_t{oid});
-  return new Store{temp_coll, oid, store};
+  t->touch(coll, ghobject_t{oid});
+  return new Store{coll, oid, store};
 }
 
 Store::Store(const coll_t& coll, const hobject_t& oid, ObjectStore* store)