From 331bfb32425cfb2046567c256f95a77754276643 Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Tue, 18 Mar 2025 08:55:30 +0000 Subject: [PATCH] Revert "tools/ceph-dencoder: Add an option stray_okay" This reverts commit d4a93ce43ad26ddcbff1c66c8c1f725aefcb84a0. Signed-off-by: Venky Shankar --- src/tools/ceph-dencoder/ceph_dencoder.cc | 6 ------ src/tools/ceph-dencoder/denc_registry.h | 7 ------- 2 files changed, 13 deletions(-) diff --git a/src/tools/ceph-dencoder/ceph_dencoder.cc b/src/tools/ceph-dencoder/ceph_dencoder.cc index 4db6d9b534e..0bc8c8ae579 100644 --- a/src/tools/ceph-dencoder/ceph_dencoder.cc +++ b/src/tools/ceph-dencoder/ceph_dencoder.cc @@ -275,12 +275,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 '" << 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 de4a2201eb3..6b152a4b234 100644 --- a/src/tools/ceph-dencoder/denc_registry.h +++ b/src/tools/ceph-dencoder/denc_registry.h @@ -30,7 +30,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; @@ -109,10 +108,6 @@ public: bool is_deterministic() override { return !nondeterministic; } - - void set_stray_okay() { - stray_okay = true; - } }; template @@ -241,8 +236,6 @@ public: bool is_deterministic() override { return true; } - void set_stray_okay() override { - } //void print(ostream& out) { //out << m_object << std::endl; -- 2.47.3