From: Sage Weil <sage@inktank.com>
Date: Fri, 31 Jan 2014 15:00:49 +0000 (-0800)
Subject: Merge branch 'wip-inline' of git://github.com/kylinstorage/ceph
X-Git-Tag: v0.78~234^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8316f1a1a9ecdaebd870ad85159d71ba3429950;p=ceph.git

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

Conflicts:
	src/include/ceph_features.h
---

f8316f1a1a9ecdaebd870ad85159d71ba3429950
diff --cc src/include/ceph_features.h
index 80699697d80e,2e02ea7c8dc7..fc9b63d6a413
--- a/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