From: Sage Weil <sage@redhat.com>
Date: Fri, 31 Oct 2014 16:52:27 +0000 (-0700)
Subject: osd/osd_types: drop category from object_info_t
X-Git-Tag: v0.91~162^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d6c803ddef535fe90935959d48dfb2ed2c0037a;p=ceph.git

osd/osd_types: drop category from object_info_t

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

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 3b98606da405..8f1b9eae27d3 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -3804,7 +3804,6 @@ void object_info_t::copy_user_bits(const object_info_t& other)
   truncate_seq = other.truncate_seq;
   truncate_size = other.truncate_size;
   flags = other.flags;
-  category = other.category;
   user_version = other.user_version;
 }
 
@@ -3834,7 +3833,7 @@ void object_info_t::encode(bufferlist& bl) const
   ENCODE_START(14, 8, bl);
   ::encode(soid, bl);
   ::encode(myoloc, bl);	//Retained for compatibility
-  ::encode(category, bl);
+  ::encode((__u32)0, bl); // was category, no longer used
   ::encode(version, bl);
   ::encode(prior_version, bl);
   ::encode(last_reqid, bl);
@@ -3867,7 +3866,10 @@ void object_info_t::decode(bufferlist::iterator& bl)
   map<entity_name_t, watch_info_t> old_watchers;
   ::decode(soid, bl);
   ::decode(myoloc, bl);
-  ::decode(category, bl);
+  {
+    string category;
+    ::decode(category, bl);  // no longer used
+  }
   ::decode(version, bl);
   ::decode(prior_version, bl);
   ::decode(last_reqid, bl);
@@ -3931,7 +3933,6 @@ void object_info_t::dump(Formatter *f) const
   f->open_object_section("oid");
   soid.dump(f);
   f->close_section();
-  f->dump_string("category", category);
   f->dump_stream("version") << version;
   f->dump_stream("prior_version") << prior_version;
   f->dump_stream("last_reqid") << last_reqid;
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 6f2c5a3891d5..c6d2347d4b40 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -2725,8 +2725,6 @@ static inline ostream& operator<<(ostream& out, const notify_info_t& n) {
 
 struct object_info_t {
   hobject_t soid;
-  string category;
-
   eversion_t version, prior_version;
   version_t user_version;
   osd_reqid_t last_reqid;