Merge branch 'wip-inline' of git://github.com/kylinstorage/ceph

Conflicts:
	src/include/ceph_features.h

diff --cc src/client/Client.cc
Simple merge

diff --cc src/client/Client.h
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/include/ceph_features.h
index 80699697d80e00a3cad2bcb013489e2958a0b8af,2e02ea7c8dc7362d9d9c8ab4118a056321c34c91..fc9b63d6a413489d552c9a00dd0fa579c4420caa
--- 1/src/include/ceph_features.h
--- 2/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@@ -44,9 -44,7 +44,10 @@@
  #define CEPH_FEATURE_EXPORT_PEER   (1ULL<<37)
  #define CEPH_FEATURE_OSD_ERASURE_CODES (1ULL<<38)
  #define CEPH_FEATURE_OSD_TMAP2OMAP (1ULL<<38)   /* overlap with EC */
 -#define CEPH_FEATURE_MDS_INLINE_DATA     (1ULL<<39)
 +/* The process supports new-style OSDMap encoding. Monitors also use
 +   this bit to determine if peers support NAK messages. */
 +#define CEPH_FEATURE_OSDMAP_ENC    (1ULL<<39)
++#define CEPH_FEATURE_MDS_INLINE_DATA     (1ULL<<40)
  
  /*
   * The introduction of CEPH_FEATURE_OSD_SNAPMAPPER caused the feature
@@@ -113,7 -111,7 +114,8 @@@ static inline unsigned long long ceph_s
         CEPH_FEATURE_CRUSH_V2 |            \
         CEPH_FEATURE_EXPORT_PEER |         \
           CEPH_FEATURE_OSD_ERASURE_CODES |   \
 -       CEPH_FEATURE_MDS_INLINE_DATA | \
 +       CEPH_FEATURE_OSDMAP_ENC |          \
++       CEPH_FEATURE_MDS_INLINE_DATA |     \
         0ULL)
  
  #define CEPH_FEATURES_SUPPORTED_DEFAULT  CEPH_FEATURES_ALL

diff --cc src/mds/mdstypes.h
Simple merge

diff --cc src/mon/MDSMonitor.cc
Simple merge

diff --cc src/mon/MonCommands.h
Simple merge

diff --cc src/osdc/Objecter.h
Simple merge