From: Sage Weil Date: Mon, 8 Feb 2016 14:17:49 +0000 (-0500) Subject: Merge pull request #6608 from esnyder/wip-6634 X-Git-Tag: v10.0.4~18 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f17dbc65df425f20592c8510f94c3cc3aabb8cad;p=ceph.git Merge pull request #6608 from esnyder/wip-6634 osd: remove unused SnapContext member snapc from MOSDSubOp message Reviewed-by: Xiaoxi Chen Reviewed-by: Sage Weil --- f17dbc65df425f20592c8510f94c3cc3aabb8cad diff --cc src/include/ceph_features.h index 2fdac206811,4663aae9c8e..c15d2af5c39 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@@ -72,9 -72,8 +72,10 @@@ #define CEPH_FEATURE_NEW_OSDOP_ENCODING (1ULL<<56) /* New, v7 encoding */ #define CEPH_FEATURE_MON_STATEFUL_SUB (1ULL<<57) /* stateful mon subscription */ #define CEPH_FEATURE_MON_ROUTE_OSDMAP (1ULL<<57) /* peon sends osdmaps */ + #define CEPH_FEATURE_OSDSUBOP_NO_SNAPCONTEXT (1ULL<<57) /* overlap, drop unused SnapContext in v12 */ #define CEPH_FEATURE_CRUSH_TUNABLES5 (1ULL<<58) /* chooseleaf stable mode */ +// duplicated since it was introduced at the same time as CEPH_FEATURE_CRUSH_TUNABLES5 +#define CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING (1ULL<<58) /* New, v7 encoding */ #define CEPH_FEATURE_RESERVED2 (1ULL<<61) /* slow down, we are almost out... */ #define CEPH_FEATURE_RESERVED (1ULL<<62) /* DO NOT USE THIS ... last bit! */