From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Mar 2016 19:24:34 +0000 (-0400)
Subject: os/ObjectStore: fix _update_op for split dest_cid
X-Git-Tag: v0.94.10~44^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5711e794218cc83db023e1d6600ed75ef3ac3fcc;p=ceph.git

os/ObjectStore: fix _update_op for split dest_cid

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e3dc7c772f563f97bc68ebc6dc6e0d408e7c11f3)
---

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index e0c12afc0678..367089726df3 100644
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -606,7 +606,7 @@ public:
 
       case OP_SPLIT_COLLECTION2:
         assert(op->cid < cm.size());
-        op->dest_cid = cm[op->dest_oid];
+	assert(op->dest_cid < cm.size());
         op->cid = cm[op->cid];
         op->dest_cid = cm[op->dest_cid];
         break;