diff options
Diffstat (limited to 'include/linux/ceph/ceph_features.h')
| -rw-r--r-- | include/linux/ceph/ceph_features.h | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/include/linux/ceph/ceph_features.h b/include/linux/ceph/ceph_features.h index f0f6c537b64c..040dd105c3e7 100644 --- a/include/linux/ceph/ceph_features.h +++ b/include/linux/ceph/ceph_features.h @@ -10,14 +10,14 @@  #define CEPH_FEATURE_INCARNATION_2 (1ull<<57) // CEPH_FEATURE_SERVER_JEWEL  #define DEFINE_CEPH_FEATURE(bit, incarnation, name)			\ -	const static uint64_t CEPH_FEATURE_##name = (1ULL<<bit);		\ -	const static uint64_t CEPH_FEATUREMASK_##name =			\ +	static const uint64_t CEPH_FEATURE_##name = (1ULL<<bit);		\ +	static const uint64_t CEPH_FEATUREMASK_##name =			\  		(1ULL<<bit | CEPH_FEATURE_INCARNATION_##incarnation);  /* this bit is ignored but still advertised by release *when* */  #define DEFINE_CEPH_FEATURE_DEPRECATED(bit, incarnation, name, when) \ -	const static uint64_t DEPRECATED_CEPH_FEATURE_##name = (1ULL<<bit); \ -	const static uint64_t DEPRECATED_CEPH_FEATUREMASK_##name =		\ +	static const uint64_t DEPRECATED_CEPH_FEATURE_##name = (1ULL<<bit); \ +	static const uint64_t DEPRECATED_CEPH_FEATUREMASK_##name =		\  		(1ULL<<bit | CEPH_FEATURE_INCARNATION_##incarnation);  /* |