From: Sage Weil <sage@redhat.com>
Date: Thu, 31 Aug 2017 21:38:11 +0000 (-0400)
Subject: osd/ReplicatedBackend: prepare_pull: simplify assert
X-Git-Tag: v13.0.1~840^2~49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=916ff5d37a89afba9e06df121d1f288e094c027c;p=ceph.git

osd/ReplicatedBackend: prepare_pull: simplify assert

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

diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index f9b181f1f29..61ab72f9beb 100644
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -1410,10 +1410,7 @@ void ReplicatedBackend::prepare_pull(
   ObcLockManager lock_manager;
 
   if (soid.is_snap()) {
-    assert(!get_parent()->get_local_missing().is_missing(
-	     soid.get_head()) ||
-	   !get_parent()->get_local_missing().is_missing(
-	     soid.get_snapdir()));
+    assert(!get_parent()->get_local_missing().is_missing(soid.get_head()));
     assert(headctx);
     // check snapset
     SnapSetContext *ssc = headctx->ssc;