From: Samuel Just <sjust@redhat.com>
Date: Tue, 22 Sep 2015 18:13:44 +0000 (-0700)
Subject: osd/: assert in HitSet constructor if type is TYPE_NONE as well
X-Git-Tag: v0.94.6~84^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ab3877dd566f3951e76abaa6b7deeb5835a512b1;p=ceph.git

osd/: assert in HitSet constructor if type is TYPE_NONE as well

Otherwise impl is unpopulated and we risk segfaults in several
methods.  It also seems like it would always indicate a bug.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 8e5a801b43babf751b619ed9606d7be7e5b12837)
---

diff --git a/src/osd/HitSet.cc b/src/osd/HitSet.cc
index 700da5d4a83..597b1f7d8f5 100644
--- a/src/osd/HitSet.cc
+++ b/src/osd/HitSet.cc
@@ -36,9 +36,6 @@ HitSet::HitSet(const HitSet::Params& params)
     impl.reset(new ExplicitObjectHitSet(static_cast<ExplicitObjectHitSet::Params*>(params.impl.get())));
     break;
 
-  case TYPE_NONE:
-    break;
-
   default:
     assert (0 == "unknown HitSet type");
   }