From: Sage Weil Date: Tue, 16 Dec 2014 22:29:39 +0000 (-0800) Subject: Merge branch 'wyc-quota-v2' of git://github.com/kylinstorage/ceph into wip-fs-quota X-Git-Tag: v0.91~21^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=47f0a52e85fd40d975edc90ca9ec49eba6769d98;p=ceph.git Merge branch 'wyc-quota-v2' of git://github.com/kylinstorage/ceph into wip-fs-quota Conflicts: src/include/ceph_features.h Reviewed-by: Sage Weil Reviewed-by: Yan, Zheng --- 47f0a52e85fd40d975edc90ca9ec49eba6769d98 diff --cc src/include/ceph_features.h index d9594a369e3a,860af30fe9b0..006a88adc155 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@@ -54,11 -54,7 +54,12 @@@ #define CEPH_FEATURE_OSD_POOLRESEND (1ULL<<43) #define CEPH_FEATURE_ERASURE_CODE_PLUGINS_V2 (1ULL<<44) #define CEPH_FEATURE_OSD_SET_ALLOC_HINT (1ULL<<45) -#define CEPH_FEATURE_MDS_QUOTA (1ULL<<46) +#define CEPH_FEATURE_OSD_FADVISE_FLAGS (1ULL<<46) ++#define CEPH_FEATURE_MDS_QUOTA (1ULL<<47) + +#define CEPH_FEATURE_RESERVED2 (1ULL<<61) /* slow down, we are almost out... */ +#define CEPH_FEATURE_RESERVED (1ULL<<62) /* DO NOT USE THIS ... last bit! */ +#define CEPH_FEATURE_RESERVED_BROKEN (1ULL<<63) /* DO NOT USE THIS; see below */ /* * The introduction of CEPH_FEATURE_OSD_SNAPMAPPER caused the feature @@@ -133,7 -129,7 +134,8 @@@ static inline unsigned long long ceph_s CEPH_FEATURE_OSD_POOLRESEND | \ CEPH_FEATURE_ERASURE_CODE_PLUGINS_V2 | \ CEPH_FEATURE_OSD_SET_ALLOC_HINT | \ + CEPH_FEATURE_OSD_FADVISE_FLAGS | \ + CEPH_FEATURE_MDS_QUOTA | \ 0ULL) #define CEPH_FEATURES_SUPPORTED_DEFAULT CEPH_FEATURES_ALL