From: Sage Weil <sage@redhat.com>
Date: Mon, 6 Apr 2015 20:54:46 +0000 (-0700)
Subject: osd: use osr for scan_snaps
X-Git-Tag: v9.1.0~324^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be6c4761d05df932ce54f68778f2b83c8165c828;p=ceph.git

osd: use osr for scan_snaps

Updates should be ordered with respect to PG metadata.  Not that it matters
that much since we are doing cleanup/repair work here.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 23961f0df61..36c664129a5 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3584,7 +3584,7 @@ void PG::_scan_snaps(ScrubMap &smap)
 			    << "...repaired";
 	}
 	snap_mapper.add_oid(hoid, oi_snaps, &_t);
-	r = osd->store->apply_transaction(t);
+	r = osd->store->apply_transaction(osr.get(), t);
 	if (r != 0) {
 	  derr << __func__ << ": apply_transaction got " << cpp_strerror(r)
 	       << dendl;