linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Bruce Fields <bfields@fieldses.org>,
	Anna Schumaker <Anna.Schumaker@netapp.com>,
	Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
	linux-fsdevel <linux-fsdevel@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PULL REQUEST] nfsd changes for 4.15
Date: Sun, 19 Nov 2017 12:03:45 -0500	[thread overview]
Message-ID: <F9DD33F8-7362-4867-9073-356737866073@oracle.com> (raw)
In-Reply-To: <CA+55aFwPHpD0Ehq8_VawfLCTXgMkbWE3fvdNc__ELmirh1rPVQ@mail.gmail.com>


> On Nov 18, 2017, at 2:40 PM, Linus Torvalds <torvalds@linux-foundation.org> wrote:
> 
> On Sat, Nov 18, 2017 at 10:40 AM, J. Bruce Fields <bfields@fieldses.org> wrote:
>> Please pull nfsd changes for 4.15 from:
> 
> Hmm. This had a tracepoint conflict with the nfs client pull.

Guessing you mean:

commit a30ccf1a9eb8c01f37675758f6359a968193d96e
Author:     Chuck Lever <chuck.lever@oracle.com>
AuthorDate: Fri Oct 20 10:35:18 2017 -0400
Commit:     Anna Schumaker <Anna.Schumaker@Netapp.com>
CommitDate: Fri Nov 17 16:43:44 2017 -0500

    SUNRPC: Fix parsing failure in trace points with XIDs
    
    mount.nf-11159   8....   905.248380: xprt_transmit:        [FAILED TO PARSE] xid=351291440 status=0 addr=192.168.2.5 port=20049
    mount.nf-11159   8....   905.248381: rpc_task_sleep:       task:6210@1 flags=0e80 state=0005 status=0 timeout=60000 queue=xprt_pending
    kworker/-1591    1....   905.248419: xprt_lookup_rqst:     [FAILED TO PARSE] xid=351291440 status=0 addr=192.168.2.5 port=20049
    kworker/-1591    1....   905.248423: xprt_complete_rqst:   [FAILED TO PARSE] xid=351291440 status=24 addr=192.168.2.5 port=20049
    
    Byte swapping is not available during trace-cmd report.
    
    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
    Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

conflicted with

commit e9d4bf219c83d09579bc62512fea2ca10f025d93
Author:     Trond Myklebust <trond.myklebust@primarydata.com>
AuthorDate: Tue Oct 10 17:31:42 2017 -0400
Commit:     J. Bruce Fields <bfields@redhat.com>
CommitDate: Wed Oct 11 17:08:52 2017 -0400

    SUNRPC: Fix tracepoint storage issues with svc_recv and svc_rqst_status
    
    There is no guarantee that either the request or the svc_xprt exist
    by the time we get round to printing the trace message.
    
    Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: J. Bruce Fields <bfields@redhat.com>

and that you adjusted a30ccf1a9eb8c01f37675758f6359a968193d96e
to eliminate the merge conflict.

At a glance I don't see a problem with the finished result.

I could have separated a30ccf1a9eb8c01f37675758f6359a968193d96e
into a server-side and client-side change.


> The resolution seems obvious and I did it, but I'd like people to
> review the end result but particularly also their workflows, because I
> don't think that conflict was reported anywhere and doesn't seem to
> exist in next-20171115.
> 
> It certainly wasn't mentioned to me in either pull request.
> 
> Were the nfs client changes not in next?
> 
> Tssk.
> 
>                      Linus

--
Chuck Lever

  parent reply	other threads:[~2017-11-19 17:03 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-18 18:40 [PULL REQUEST] nfsd changes for 4.15 J. Bruce Fields
2017-11-18 19:40 ` Linus Torvalds
2017-11-19 12:20   ` Stephen Rothwell
2017-11-19 17:03   ` Chuck Lever [this message]
2017-11-27 22:12     ` Bruce Fields

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=F9DD33F8-7362-4867-9073-356737866073@oracle.com \
    --to=chuck.lever@oracle.com \
    --cc=Anna.Schumaker@netapp.com \
    --cc=bfields@fieldses.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).