LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jeff Layton <jlayton@kernel.org>
To: asmadeus@codewreck.org, cgel.zte@gmail.com
Cc: ericvh@gmail.com, lucho@ionkov.net,
	v9fs-developer@lists.sourceforge.net,
	linux-kernel@vger.kernel.org, ran.xiaokai@zte.com.cn,
	Zeal Robot <zealci@zte.com.cn>
Subject: Re: [PATCH] fs: 9q: remove unnecessary label "out_err"
Date: Tue, 24 Aug 2021 06:21:45 -0400	[thread overview]
Message-ID: <9fdf35533dab9ae95947bcc3709d14a268b14368.camel@kernel.org> (raw)
In-Reply-To: <YSSl4tPGeowannmy@codewreck.org>

On Tue, 2021-08-24 at 16:55 +0900, asmadeus@codewreck.org wrote:
> cgel.zte@gmail.com wrote on Tue, Aug 24, 2021 at 12:45:03AM -0700:
> > From: CGEL <ran.xiaokai@zte.com.cn>
> > 
> > due to commit 798b2ae3cd58 ("Merge remote-tracking branch
> > 'file-locks/locks-next'"), label "out_err" should be removed to
> > avoid build warning.
> 
> That commit is not in master (it's a linux-next commit), you cannot
> refer to a commit id that hasn't been merged in commit messages.
> Also given it's a trivial merge commit so please take a minute to find
> the real culprit (fs: remove mandatory file locking support) next time.
> 
> 
> Given it's not merged yet, Jeff can still fix his patch in his branch,
> I've added him to recipients -- can you remove the label?
> I've never used mandatory file locking myself so I'll admit I didn't
> really look at your patch the other day...
> 

Yep, I've already fixed this in my branch. The next linux-next merge
should have it. We'll probably merge the patch in v5.15, so hopefully
any pain and merge conflicts will be short-lived...

Thanks,
Jeff

> > 
> > Reported-by: Zeal Robot <zealci@zte.com.cn>
> > Signed-off-by: CGEL <ran.xiaokai@zte.com.cn>
> > ---
> >  fs/9p/vfs_file.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
> > index 978666530d8e..d2d83163d6b0 100644
> > --- a/fs/9p/vfs_file.c
> > +++ b/fs/9p/vfs_file.c
> > @@ -319,7 +319,7 @@ static int v9fs_file_lock_dotl(struct file *filp, int cmd, struct file_lock *fl)
> >  		ret = v9fs_file_getlock(filp, fl);
> >  	else
> >  		ret = -EINVAL;
> > -out_err:
> > +
> >  	return ret;
> >  }
> 
> Thanks,

-- 
Jeff Layton <jlayton@kernel.org>


      reply	other threads:[~2021-08-24 10:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-24  7:45 cgel.zte
2021-08-24  7:55 ` asmadeus
2021-08-24 10:21   ` Jeff Layton [this message]

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=9fdf35533dab9ae95947bcc3709d14a268b14368.camel@kernel.org \
    --to=jlayton@kernel.org \
    --cc=asmadeus@codewreck.org \
    --cc=cgel.zte@gmail.com \
    --cc=ericvh@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lucho@ionkov.net \
    --cc=ran.xiaokai@zte.com.cn \
    --cc=v9fs-developer@lists.sourceforge.net \
    --cc=zealci@zte.com.cn \
    --subject='Re: [PATCH] fs: 9q: remove unnecessary label "out_err"' \
    /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

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).