diff options
| author | Trond Myklebust | 2017-11-18 19:50:11 +0100 |
|---|---|---|
| committer | Anna Schumaker | 2017-11-29 19:46:32 +0100 |
| commit | 445f288d706cb5a418b13c340280b47d4585d667 (patch) | |
| tree | 32b9b8470654c432c52d8c03f927e30907d04c7f | |
| parent | NFS: Revert "NFS: Move the flock open mode check into nfs_flock()" (diff) | |
| download | kernel-qcow2-linux-445f288d706cb5a418b13c340280b47d4585d667.tar.gz kernel-qcow2-linux-445f288d706cb5a418b13c340280b47d4585d667.tar.xz kernel-qcow2-linux-445f288d706cb5a418b13c340280b47d4585d667.zip | |
NFSv4: Ensure gcc 4.4.4 can compile initialiser for "invalid_stateid"
gcc 4.4.4 is too old to have full C11 anonymous union support, so
the current initialiser fails to compile.
Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
(compile-)Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
| -rw-r--r-- | fs/nfs/nfs4state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 54fd56d715a8..e4f4a09ed9f4 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -71,8 +71,8 @@ const nfs4_stateid zero_stateid = { }; const nfs4_stateid invalid_stateid = { { - .seqid = cpu_to_be32(0xffffffffU), - .other = { 0 }, + /* Funky initialiser keeps older gcc versions happy */ + .data = { 0xff, 0xff, 0xff, 0xff, 0 }, }, .type = NFS4_INVALID_STATEID_TYPE, }; |