From: Sage Weil <sage@redhat.com>
Date: Wed, 22 Feb 2017 18:08:49 +0000 (-0600)
Subject: osd/osd_types: remove unused snapcolls from ScrubMap::object
X-Git-Tag: v12.0.3~28^2~35
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d87287d45f8b2de69ef53e8ca12dda6cb3567b7;p=ceph.git

osd/osd_types: remove unused snapcolls from ScrubMap::object

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

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 5db71951d7be..f909c9e9b477 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -5578,7 +5578,7 @@ void ScrubMap::object::encode(bufferlist& bl) const
   ::encode(digest, bl);
   ::encode(digest_present, bl);
   ::encode((uint32_t)0, bl);  // obsolete nlinks
-  ::encode(snapcolls, bl);
+  ::encode((uint32_t)0, bl);  // snapcolls
   ::encode(omap_digest, bl);
   ::encode(omap_digest_present, bl);
   ::encode(compat_read_error, bl);
@@ -5600,9 +5600,12 @@ void ScrubMap::object::decode(bufferlist::iterator& bl)
   ::decode(digest, bl);
   ::decode(tmp, bl);
   digest_present = tmp;
-  uint32_t nlinks;
-  ::decode(nlinks, bl);
-  ::decode(snapcolls, bl);
+  {
+    uint32_t nlinks;
+    ::decode(nlinks, bl);
+    set<snapid_t> snapcolls;
+    ::decode(snapcolls, bl);
+  }
   ::decode(omap_digest, bl);
   ::decode(tmp, bl);
   omap_digest_present = tmp;
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 205ad8abfe6c..f0c5db17002b 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -4653,7 +4653,6 @@ ostream& operator<<(ostream& out, const PushOp &op);
 struct ScrubMap {
   struct object {
     map<string,bufferptr> attrs;
-    set<snapid_t> snapcolls;
     uint64_t size;
     __u32 omap_digest;         ///< omap crc32c
     __u32 digest;              ///< data crc32c