2019-08-31 22:01:37

by Krzysztof Wilczyński

Subject: [PATCH] ceph: Move static keyword to the front of declarations

Move the static keyword to the front of declarations of
snap_handle_length, handle_length and connected_handle_length,
and resolve the following compiler warnings that can be seen
when building with warnings enabled (W=1):

fs/ceph/export.c:38:2: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

fs/ceph/export.c:88:2: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

fs/ceph/export.c:90:2: warning:
‘static’ is not at beginning of declaration [-Wold-style-declaration]

Signed-off-by: Krzysztof Wilczynski <[email protected]>
---
Related: https://lore.kernel.org/r/[email protected]

fs/ceph/export.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/ceph/export.c b/fs/ceph/export.c
index 020d39a85ecc..b6bfa94332c3 100644
--- a/fs/ceph/export.c
+++ b/fs/ceph/export.c
@@ -35,7 +35,7 @@ struct ceph_nfs_snapfh {
static int ceph_encode_snapfh(struct inode *inode, u32 *rawfh, int *max_len,
struct inode *parent_inode)
{
- const static int snap_handle_length =
+ static const int snap_handle_length =
sizeof(struct ceph_nfs_snapfh) >> 2;
struct ceph_nfs_snapfh *sfh = (void *)rawfh;
u64 snapid = ceph_snap(inode);
@@ -85,9 +85,9 @@ static int ceph_encode_snapfh(struct inode *inode, u32 *rawfh, int *max_len,
static int ceph_encode_fh(struct inode *inode, u32 *rawfh, int *max_len,
struct inode *parent_inode)
{
- const static int handle_length =
+ static const int handle_length =
sizeof(struct ceph_nfs_fh) >> 2;
- const static int connected_handle_length =
+ static const int connected_handle_length =
sizeof(struct ceph_nfs_confh) >> 2;
int type;

--
2.22.1

2019-09-02 08:57:23

by Ilya Dryomov

Subject: Re: [PATCH] ceph: Move static keyword to the front of declarations

On Sat, Aug 31, 2019 at 11:57 PM Krzysztof Wilczynski <[email protected]> wrote:
>
> Move the static keyword to the front of declarations of
> snap_handle_length, handle_length and connected_handle_length,
> and resolve the following compiler warnings that can be seen
> when building with warnings enabled (W=1):
>
> fs/ceph/export.c:38:2: warning:
> ‘static’ is not at beginning of declaration [-Wold-style-declaration]
>
> fs/ceph/export.c:88:2: warning:
> ‘static’ is not at beginning of declaration [-Wold-style-declaration]
>
> fs/ceph/export.c:90:2: warning:
> ‘static’ is not at beginning of declaration [-Wold-style-declaration]
>
> Signed-off-by: Krzysztof Wilczynski <[email protected]>
> ---
> Related: https://lore.kernel.org/r/[email protected]
>
> fs/ceph/export.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fs/ceph/export.c b/fs/ceph/export.c
> index 020d39a85ecc..b6bfa94332c3 100644
> --- a/fs/ceph/export.c
> +++ b/fs/ceph/export.c
> @@ -35,7 +35,7 @@ struct ceph_nfs_snapfh {
> static int ceph_encode_snapfh(struct inode *inode, u32 *rawfh, int *max_len,
> struct inode *parent_inode)
> {
> - const static int snap_handle_length =
> + static const int snap_handle_length =
> sizeof(struct ceph_nfs_snapfh) >> 2;
> struct ceph_nfs_snapfh *sfh = (void *)rawfh;
> u64 snapid = ceph_snap(inode);
> @@ -85,9 +85,9 @@ static int ceph_encode_snapfh(struct inode *inode, u32 *rawfh, int *max_len,
> static int ceph_encode_fh(struct inode *inode, u32 *rawfh, int *max_len,
> struct inode *parent_inode)
> {
> - const static int handle_length =
> + static const int handle_length =
> sizeof(struct ceph_nfs_fh) >> 2;
> - const static int connected_handle_length =
> + static const int connected_handle_length =
> sizeof(struct ceph_nfs_confh) >> 2;
> int type;

Applied.

Thanks,

Ilya