Merge pull request #6608 from esnyder/wip-6634

osd: remove unused SnapContext member snapc from MOSDSubOp message

Reviewed-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/include/ceph_features.h
index 2fdac20681116c7b7e9f3fef29929254a1044f9e,4663aae9c8e17b0732305d21edacf52e9e1893c4..c15d2af5c392baec56df08e1673383892a6f6073
--- 1/src/include/ceph_features.h
--- 2/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! */