Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e67ae2b7 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Ilya Dryomov
Browse files

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: f179d3ba ("libceph: new features macros")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 5771a8c0

include/linux/ceph/ceph_features.h

+4 −4
Original line number Diff line number Diff line
@@ -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);



/*