2016-10-18 15:21:56

by Arnd Bergmann

Subject: [PATCH] nfs4: fix missing-braces warning

A bugfix introduced a harmless warning for update_open_stateid:

fs/nfs/nfs4proc.c:1548:2: error: missing braces around initializer [-Werror=missing-braces]

Removing the zero in the initializer will do the right thing here
and initialize the entire structure to zero.

Fixes: 1393d9612ba0 ("NFSv4: Fix a race when updating an open_stateid")
Signed-off-by: Arnd Bergmann <[email protected]>
---
fs/nfs/nfs4proc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ad917bd72b38..7897826d7c51 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1545,7 +1545,7 @@ static int update_open_stateid(struct nfs4_state *state,
struct nfs_client *clp = server->nfs_client;
struct nfs_inode *nfsi = NFS_I(state->inode);
struct nfs_delegation *deleg_cur;
- nfs4_stateid freeme = {0};
+ nfs4_stateid freeme = { };
int ret = 0;

fmode &= (FMODE_READ|FMODE_WRITE);
--
2.9.0

2016-10-19 18:51:56

by Anna Schumaker

Subject: Re: [PATCH] nfs4: fix missing-braces warning

Hi Arnd (and Geert, if you're out there. I keep getting "relay access denied" when I try to CC you),

Thanks for the patches for this issue! I've applied Arnd's version for 4.9-rc* since I think it looks a little cleaner.

Cheers,
Anna


On 10/18/2016 11:21 AM, Arnd Bergmann wrote:
> A bugfix introduced a harmless warning for update_open_stateid:
>
> fs/nfs/nfs4proc.c:1548:2: error: missing braces around initializer [-Werror=missing-braces]
>
> Removing the zero in the initializer will do the right thing here
> and initialize the entire structure to zero.
>
> Fixes: 1393d9612ba0 ("NFSv4: Fix a race when updating an open_stateid")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> fs/nfs/nfs4proc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index ad917bd72b38..7897826d7c51 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -1545,7 +1545,7 @@ static int update_open_stateid(struct nfs4_state *state,
> struct nfs_client *clp = server->nfs_client;
> struct nfs_inode *nfsi = NFS_I(state->inode);
> struct nfs_delegation *deleg_cur;
> - nfs4_stateid freeme = {0};
> + nfs4_stateid freeme = { };
> int ret = 0;
>
> fmode &= (FMODE_READ|FMODE_WRITE);
>