From dde83262c1f74dee4ccc09b11b57254c2c3990fc Mon Sep 17 00:00:00 2001
From: Samuel Just <sam.just@inktank.com>
Date: Wed, 9 Jan 2013 11:53:52 -0800
Subject: osd_types: add nlink and snapcolls fields to ScrubMap::object

Signed-off-by: Samuel Just <sam.just@inktank.com>
---
 src/osd/osd_types.cc | 14 ++++++++++++--
 src/osd/osd_types.h  |  6 +++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 74975a91758..5b15afed065 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -2508,18 +2508,20 @@ void ScrubMap::generate_test_instances(list<ScrubMap*>& o)
 
 void ScrubMap::object::encode(bufferlist& bl) const
 {
-  ENCODE_START(3, 2, bl);
+  ENCODE_START(4, 2, bl);
   ::encode(size, bl);
   ::encode(negative, bl);
   ::encode(attrs, bl);
   ::encode(digest, bl);
   ::encode(digest_present, bl);
+  ::encode(nlinks, bl);
+  ::encode(snapcolls, bl);
   ENCODE_FINISH(bl);
 }
 
 void ScrubMap::object::decode(bufferlist::iterator& bl)
 {
-  DECODE_START_LEGACY_COMPAT_LEN(3, 2, 2, bl);
+  DECODE_START_LEGACY_COMPAT_LEN(4, 2, 2, bl);
   ::decode(size, bl);
   ::decode(negative, bl);
   ::decode(attrs, bl);
@@ -2531,6 +2533,14 @@ void ScrubMap::object::decode(bufferlist::iterator& bl)
     digest = 0;
     digest_present = false;
   }
+  if (struct_v >= 4) {
+    ::decode(nlinks, bl);
+    ::decode(snapcolls, bl);
+  } else {
+    /* Indicates that encoder was not aware of this field since stat must
+     * return nlink >= 1 */
+    nlinks = 0;
+  }
   DECODE_FINISH(bl);
 }
 
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index b2a41a175a7..dde2d7697d2 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -1751,8 +1751,12 @@ struct ScrubMap {
     map<string,bufferptr> attrs;
     __u32 digest;
     bool digest_present;
+    uint32_t nlinks;
+    set<snapid_t> snapcolls;
 
-    object(): size(0), negative(false), digest(0), digest_present(false) {}
+    object() :
+      size(0), negative(false), digest(0), digest_present(false),
+      nlinks(0) {}
 
     void encode(bufferlist& bl) const;
     void decode(bufferlist::iterator& bl);
-- 
cgit v1.2.1