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 fbed468b90f062bbe08cf43467bd0d8090faaeb0..e439924867d871feb9639204c3b44be25566d25e 100644 (file)
--- 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 8ddacddda21e95d5b9d915ddad5707074d7ab4ce..0a4aafabcb41c923a1b3f7b3dd447723cbb50cb5 100644 (file)
--- 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)