From: Greg Farnum <greg@inktank.com>
Date: Fri, 18 Jan 2013 00:22:59 +0000 (-0800)
Subject: CInode: use modern encoding for encode_export/decode_import
X-Git-Tag: v0.58~100^2~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb060bb42361d4e576248155d722e0b909230311;p=ceph.git

CInode: use modern encoding for encode_export/decode_import

Signed-off-by: Greg Farnum <greg@inktank.com>
---

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 97e4b1fbd4c..b059ec54ebe 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -3033,8 +3033,7 @@ void CInode::_decode_locks_rejoin(bufferlist::iterator& p, list<Context*>& waite
 
 void CInode::encode_export(bufferlist& bl)
 {
-  __u8 struct_v = 2;
-  ::encode(struct_v, bl);
+  ENCODE_START(3, 3, bl)
   _encode_base(bl);
 
   bool dirty = is_dirty();
@@ -3064,6 +3063,7 @@ void CInode::encode_export(bufferlist& bl)
 
   _encode_locks_full(bl);
   get(PIN_TEMPEXPORTING);
+  ENCODE_FINISH(bl);
 }
 
 void CInode::finish_export(utime_t now)
@@ -3081,8 +3081,7 @@ void CInode::finish_export(utime_t now)
 void CInode::decode_import(bufferlist::iterator& p,
 			   LogSegment *ls)
 {
-  __u8 struct_v;
-  ::decode(struct_v, p);
+  DECODE_START_LEGACY_COMPAT_LEN(3, 3, 3, p);
 
   _decode_base(p);
 
@@ -3144,4 +3143,5 @@ void CInode::decode_import(bufferlist::iterator& p,
   }
 
   _decode_locks_full(p);
+  DECODE_FINISH(p);
 }