From: Ilya Dryomov Date: Thu, 12 Mar 2026 10:30:24 +0000 (+0100) Subject: include/ceph_features: note more kernel versions X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d77955e8368981ebfe17f318fc531272e2ed0a8;p=ceph.git include/ceph_features: note more kernel versions Despite both MONNAMES and MONENC being pre-argonaut feature bits and the kernel client implicitly assuming argonaut since 5.0, its monmap decoding routine didn't handle MONNAMES and MONENC until 5.11 (when it became necessary as part of msgr2 support). Signed-off-by: Ilya Dryomov --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 5a607ef4b5a..4b49f5ee621 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -85,10 +85,10 @@ DEFINE_CEPH_FEATURE( 0, 1, UID) DEFINE_CEPH_FEATURE( 1, 1, NOSRCADDR) // 2.6.35 req DEFINE_CEPH_FEATURE_RETIRED( 2, 1, MONCLOCKCHECK, JEWEL, LUMINOUS) -DEFINE_CEPH_FEATURE( 2, 3, SERVER_NAUTILUS) +DEFINE_CEPH_FEATURE( 2, 3, SERVER_NAUTILUS) // 5.11 DEFINE_CEPH_FEATURE( 3, 1, FLOCK) // 2.6.36 DEFINE_CEPH_FEATURE( 4, 1, SUBSCRIBE2) // 4.6 req -DEFINE_CEPH_FEATURE( 5, 1, MONNAMES) +DEFINE_CEPH_FEATURE( 5, 1, MONNAMES) // 5.11 req DEFINE_CEPH_FEATURE( 6, 1, RECONNECT_SEQ) // 3.10 req DEFINE_CEPH_FEATURE( 7, 1, DIRLAYOUTHASH) // 2.6.38 DEFINE_CEPH_FEATURE( 8, 1, OBJECTLOCATOR) @@ -99,7 +99,7 @@ DEFINE_CEPH_FEATURE(12, 1, OSDREPLYMUX) DEFINE_CEPH_FEATURE(13, 1, OSDENC) // 3.9 req DEFINE_CEPH_FEATURE_RETIRED(14, 1, OMAP, HAMMER, JEWEL) DEFINE_CEPH_FEATURE(14, 2, SERVER_KRAKEN) -DEFINE_CEPH_FEATURE(15, 1, MONENC) +DEFINE_CEPH_FEATURE(15, 1, MONENC) // 5.11 req DEFINE_CEPH_FEATURE_RETIRED(16, 1, QUERY_T, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(16, 3, SERVER_OCTOPUS) DEFINE_CEPH_FEATURE(16, 3, OSD_REPOP_MLCOD) @@ -125,7 +125,7 @@ DEFINE_CEPH_FEATURE(25, 1, CRUSH_TUNABLES2) // 3.9 DEFINE_CEPH_FEATURE(26, 1, CREATEPOOLID) DEFINE_CEPH_FEATURE(27, 1, REPLY_CREATE_INODE) // 3.9 DEFINE_CEPH_FEATURE_RETIRED(28, 1, OSD_HBMSGS, HAMMER, JEWEL) -DEFINE_CEPH_FEATURE(28, 2, SERVER_MIMIC) +DEFINE_CEPH_FEATURE(28, 2, SERVER_MIMIC) // 5.11 DEFINE_CEPH_FEATURE(29, 1, MDSENC) // 4.7 DEFINE_CEPH_FEATURE(30, 1, OSDHASHPSPOOL) // 3.9 DEFINE_CEPH_FEATURE_RETIRED(31, 1, MON_SINGLE_PAXOS, NAUTILUS, PACIFIC) @@ -178,7 +178,7 @@ DEFINE_CEPH_FEATURE(57, 1, SERVER_JEWEL) // overlap DEFINE_CEPH_FEATURE(58, 1, CRUSH_TUNABLES5) // 4.5 DEFINE_CEPH_FEATURE(58, 1, NEW_OSDOPREPLY_ENCODING) // overlap DEFINE_CEPH_FEATURE(58, 1, FS_FILE_LAYOUT_V2) // overlap -DEFINE_CEPH_FEATURE(59, 1, FS_BTIME) +DEFINE_CEPH_FEATURE(59, 1, FS_BTIME) // 5.3 DEFINE_CEPH_FEATURE(59, 1, FS_CHANGE_ATTR) // overlap DEFINE_CEPH_FEATURE(59, 1, MSG_ADDR2) // overlap DEFINE_CEPH_FEATURE(60, 1, OSD_RECOVERY_DELETES) // *do not share this bit*