From: Sage Weil Date: Tue, 16 Dec 2014 16:49:44 +0000 (-0800) Subject: Merge pull request #2300 from ceph/wip-osdmap X-Git-Tag: v0.91~55^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eef1705354d7661914dd09adc9627d52e03ac8dc;p=ceph.git Merge pull request #2300 from ceph/wip-osdmap add osdmap checksums sage-2014-12-16_06:27:10-rados:singleton-wip-sage-testing2-distro-basic-multi sage-2014-12-15_13:18:23-rados:thrash-wip-sage-testing2-distro-basic-multi Reviewed-by: Samuel Just --- eef1705354d7661914dd09adc9627d52e03ac8dc diff --cc src/include/ceph_features.h index a193d5eb93c,e60d72c39bf..d9594a369e3 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@@ -54,8 -54,11 +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_OSD_FADVISE_FLAGS (1ULL<<46) + #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 * vector to evaluate to 64 bit ~0. To cope, we designate 1ULL << 63