Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1684147 > unrolled thread
| Started by | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| First post | 2017-07-10 13:20 +0200 |
| Last post | 2017-07-10 15:20 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] libceph: fix old style declaration warnings Arnd Bergmann <arnd@arndb.de> - 2017-07-10 13:20 +0200
Re: [PATCH] libceph: fix old style declaration warnings Ilya Dryomov <idryomov@gmail.com> - 2017-07-10 15:20 +0200
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2017-07-10 13:20 +0200 |
| Subject | [PATCH] libceph: fix old style declaration warnings |
| Message-ID | <u1ETo-4kq-35@gated-at.bofh.it> |
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 <arnd@arndb.de>
---
include/linux/ceph/ceph_features.h | 8 ++++----
1 file 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);
/*
--
2.9.0
[toc] | [next] | [standalone]
| From | Ilya Dryomov <idryomov@gmail.com> |
|---|---|
| Date | 2017-07-10 15:20 +0200 |
| Message-ID | <u1GLw-5vA-13@gated-at.bofh.it> |
| In reply to | #1684147 |
On Mon, Jul 10, 2017 at 1:17 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> 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 <arnd@arndb.de>
Applied.
Thanks,
Ilya
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web