libceph: fix old style declaration warnings

PATCH Applied Arnd Bergmann 2 participants 2 messages Jul 10, 2017 Ceph common code (libceph)

lore

Share & tools

lore

Arnd Bergmann

author

2017-07-10 11:17 UTC #0 lore raw

PATCH 1/1 libceph: fix old style declaration warnings

The new macros don't follow the usual style for declarations, which we get a warning for with 'make W=1':

In file included from fs/ceph/mds_client.c:16:0:
include/linux/ceph/ceph_features.h:74:1: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration]

This moves the 'static' keyword to the front of the declaration.

Fixes f179d3ba8cb9 ("libceph: new features macros")

Signed-off-by Arnd Bergmann <[email protected]>

---
 include/linux/ceph/ceph_features.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

include/linux/ceph/ceph_features.h +4 -4

index f0f6c537b64c..040dd105c3e7 100644
@@ -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);
 
 /*

Signature · 1 line

2.9.0

Ilya Dryomov

maintainer Applied

2017-07-10 13:17 UTC #1 lore raw

Quoted 11 lines · Arnd Bergmann

The new macros don't follow the usual style for declarations, which we get a warning for with 'make W=1':
In file included from fs/ceph/mds_client.c:16:0:
include/linux/ceph/ceph_features.h:74:1: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration]
This moves the 'static' keyword to the front of the declaration.
Fixes f179d3ba8cb9 ("libceph: new features macros")
Signed-off-by Arnd Bergmann <[email protected]>

Applied.

Thanks,

Ilya