From: Greg Farnum <gregf@hq.newdream.net>
Date: Thu, 29 Apr 2010 17:49:07 +0000 (-0700)
Subject: mds: fcntl. add proper encoding to ceph_filelock and ceph_lock_state_t
X-Git-Tag: v0.22~346^2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b7b349e2aa6fc233e27ba0ec2c5073ba7967a9af;p=ceph.git

mds: fcntl. add proper encoding to ceph_filelock and ceph_lock_state_t
---

diff --git a/src/include/types.h b/src/include/types.h
index fbed468b90f..e439924867d 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -215,6 +215,7 @@ WRITE_RAW_ENCODER(ceph_pg_pool)
 WRITE_RAW_ENCODER(ceph_mds_session_head)
 WRITE_RAW_ENCODER(ceph_mds_request_head)
 WRITE_RAW_ENCODER(ceph_mds_request_release)
+WRITE_RAW_ENCODER(ceph_filelock)
 WRITE_RAW_ENCODER(ceph_mds_caps)
 WRITE_RAW_ENCODER(ceph_mds_cap_release)
 WRITE_RAW_ENCODER(ceph_mds_cap_item)
diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 8ddacddda21..0a4aafabcb4 100644
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -666,7 +666,18 @@ private:
     }
     return false;
   }
+
+public:
+  void encode(bufferlist& bl) const {
+    ::encode(held_locks, bl);
+    ::encode(waiting_locks, bl);
+  }
+  void decode(bufferlist::iterator& bl) {
+    ::decode(held_locks, bl);
+    ::decode(waiting_locks, bl);
+  }
 };
+WRITE_CLASS_ENCODER(ceph_lock_state_t)
 
 struct inode_t {
   // base (immutable)