Revert "tools/ceph-dencoder: Add an option stray_okay"

This reverts commit d4a93ce43ad26ddcbff1c66c8c1f725aefcb84a0.

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 0e132d7d9da5b81b2159b193ee835c93e441374c)

diff --git a/src/tools/ceph-dencoder/ceph_dencoder.cc b/src/tools/ceph-dencoder/ceph_dencoder.cc
index a7273622a29e501e9acc3be9ccfb62a708f5c173..24640f9b51d656e5aa09bb0b3a7ef27d76993742 100644 (file)
--- a/src/tools/ceph-dencoder/ceph_dencoder.cc
+++ b/src/tools/ceph-dencoder/ceph_dencoder.cc
@@ -274,12 +274,6 @@ int main(int argc, const char **argv)
        return 0;
       else
        return 1;
-    } else if (*i == string("stray_okay")) {
-      if (!den) {
-       cerr << "must first select type with 'type <name>'" << std::endl;
-       return 1;
-      }
-      den->set_stray_okay();
     } else {
       cerr << "unknown option '" << *i << "'" << std::endl;
       return 1;

diff --git a/src/tools/ceph-dencoder/denc_registry.h b/src/tools/ceph-dencoder/denc_registry.h
index 4a24162ff1efbdbff504d1687b6fca06e2c23a1d..61acc833b90ee3a55ecf32f5a7c26256e1e8a9a0 100644 (file)
--- a/src/tools/ceph-dencoder/denc_registry.h
+++ b/src/tools/ceph-dencoder/denc_registry.h
@@ -29,7 +29,6 @@ struct Dencoder {
   virtual int num_generated() = 0;
   virtual std::string select_generated(unsigned n) = 0;
   virtual bool is_deterministic() = 0;
-  virtual void set_stray_okay() = 0;
   unsigned get_struct_v(bufferlist bl, uint64_t seek) const {
     auto p = bl.cbegin(seek);
     uint8_t struct_v = 0;
@@ -99,10 +98,6 @@ public:
   bool is_deterministic() override {
     return !nondeterministic;
   }
-
-  void set_stray_okay() {
-    stray_okay = true;
-  }
 };
 
 template<class T>
@@ -225,8 +220,6 @@ public:
   bool is_deterministic() override {
     return true;
   }
-  void set_stray_okay() override {
-  }
 
   //void print(ostream& out) {
   //out << m_object << std::endl;