From: Sage Weil <sage@redhat.com>
Date: Mon, 1 Feb 2016 14:27:43 +0000 (-0500)
Subject: osd/ReplicatedPG: fix promote obc setup when recency > 1
X-Git-Tag: v10.1.0~145^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a7642825ccfc0bdb34058c85563b804c9ca57b3d;p=ceph.git

osd/ReplicatedPG: fix promote obc setup when recency > 1

Pass promote_obc like the other call sites.

This was broken by d36d7f24fb001c136ec5a0c8bf9e52411d6c0947.

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 8286b774ad5..4402ec2b0be 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -2366,7 +2366,7 @@ bool ReplicatedPG::maybe_promote(ObjectContextRef obc,
 	}
       }
       if (count >= recency) {
-	promote_object(obc, missing_oid, oloc, promote_op);
+	promote_object(obc, missing_oid, oloc, promote_op, promote_obc);
       } else {
 	// not promoting
 	return false;