msgr: Add CEPH_FEATURE_FLOCK to default features set, remove extraneous data from...

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 839fbecd7109e0d9b9b29238525c957a287dd12a..1b8ee257bb0e1a27bfdabd977716a76fb834a234 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -671,8 +671,6 @@ struct ceph_mds_cap_reconnect {
        __le64 cap_id;
        __le32 wanted;
        __le32 issued;
-       __le64 size;
-       struct ceph_timespec mtime, atime;
        __le64 snaprealm;
        __le64 pathbase;        /* base ino for our path to this ino */
        __le32 flock_len;       /* size of flock state blob, if any */

diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index a951de7ed6ef4dece0ec4584527b93a09df498c5..a330d83fa850bfc9c8fc380ac31eed6de6ddcb87 100644 (file)
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -55,7 +55,8 @@ using namespace __gnu_cxx;
 #define MSGR_FEATURES_SUPPORTED  \
   CEPH_FEATURE_NOSRCADDR |      \
   CEPH_FEATURE_SUBSCRIBE2 |     \
-  CEPH_FEATURE_MONNAMES
+  CEPH_FEATURE_MONNAMES |        \
+  CEPH_FEATURE_FLOCK
 
 class SimpleMessenger : public Messenger {
 public: