[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <33264809-a49c-7c91-842f-153dd0eaf66c@Netapp.com>
Date: Thu, 30 Nov 2017 08:05:39 -0500
From: Anna Schumaker <Anna.Schumaker@...app.com>
To: Trond Myklebust <trondmy@...marydata.com>,
"torvalds@...ux-foundation.org" <torvalds@...ux-foundation.org>,
"rostedt@...dmis.org" <rostedt@...dmis.org>
CC: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"akpm@...ux-foundation.org" <akpm@...ux-foundation.org>
Subject: Re: [BUILD FAILURE] nfs4state.c fails to compile with gcc 4.5.4
On 11/30/2017 06:46 AM, Trond Myklebust wrote:
> On Wed, 2017-11-29 at 23:05 -0500, Steven Rostedt wrote:
>> On Wed, 29 Nov 2017 19:44:33 -0800
>> Linus Torvalds <torvalds@...ux-foundation.org> wrote:
>>
>> I keep older compilers around to test ftrace before -mfentry was
>> introduced.
>>
>> I wonder if I should just add a config to force the use without
>> -mfentry even if the compiler supports it.
>>
>>> fs/nfs/nfs4state.c | 3 +--
>>> include/linux/nfs4.h | 2 +-
>>> 2 files changed, 2 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
>>> index 54fd56d715a8..9db5d0d57fcb 100644
>>> --- a/fs/nfs/nfs4state.c
>>> +++ b/fs/nfs/nfs4state.c
>>> @@ -71,8 +71,7 @@ const nfs4_stateid zero_stateid = {
>>> };
>>> const nfs4_stateid invalid_stateid = {
>>> {
>>> - .seqid = cpu_to_be32(0xffffffffU),
>>> - .other = { 0 },
>>> + { .seqid = cpu_to_be32(0xffffffffU), .other = { 0
>>> }, },
>>
>> I tried this and it failed.
>>
>>> },
>>> .type = NFS4_INVALID_STATEID_TYPE,
>>> };
>>> diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
>>> index 47adac640191..e394ba0cd6c5 100644
>>> --- a/include/linux/nfs4.h
>>> +++ b/include/linux/nfs4.h
>>> @@ -53,11 +53,11 @@ typedef struct { char data[NFS4_VERIFIER_SIZE];
>>> } nfs4_verifier;
>>>
>>> struct nfs4_stateid_struct {
>>> union {
>>> - char data[NFS4_STATEID_SIZE];
>>> struct {
>>> __be32 seqid;
>>> char other[NFS4_STATEID_OTHER_SIZE];
>>> } __attribute__ ((packed));
>>> + char data[NFS4_STATEID_SIZE];
>>
>> But I didn't try this. This looks to be the key.
>>
>> This works for me.
>>
>> Tested-by: Steven Rostedt (VMware) <rostedt@...dmis.org>
>>
>> -- Steve
>>
>>> };
>>>
>>> enum {
>>
>>
>
> We already have a fix queued up for this issue. It was reported and the
> patch hit linux-nfs+linux-kernel almost 2 weeks ago. Anna?
I have it queued up, and I was planning to send it this week with some other fixes.
Anna
>
Powered by blists - more mailing lists