LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] fs: 9q: remove unnecessary label "out_err"
@ 2021-08-24  7:45 cgel.zte
  2021-08-24  7:55 ` asmadeus
  0 siblings, 1 reply; 3+ messages in thread
From: cgel.zte @ 2021-08-24  7:45 UTC (permalink / raw)
  To: ericvh, lucho, asmadeus
  Cc: v9fs-developer, linux-kernel, ran.xiaokai, Zeal Robot

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.

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;
 }
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] fs: 9q: remove unnecessary label "out_err"
  2021-08-24  7:45 [PATCH] fs: 9q: remove unnecessary label "out_err" cgel.zte
@ 2021-08-24  7:55 ` asmadeus
  2021-08-24 10:21   ` Jeff Layton
  0 siblings, 1 reply; 3+ messages in thread
From: asmadeus @ 2021-08-24  7:55 UTC (permalink / raw)
  To: cgel.zte, Jeff Layton
  Cc: ericvh, lucho, v9fs-developer, linux-kernel, ran.xiaokai, Zeal Robot

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

> 
> 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,
-- 
Dominique

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] fs: 9q: remove unnecessary label "out_err"
  2021-08-24  7:55 ` asmadeus
@ 2021-08-24 10:21   ` Jeff Layton
  0 siblings, 0 replies; 3+ messages in thread
From: Jeff Layton @ 2021-08-24 10:21 UTC (permalink / raw)
  To: asmadeus, cgel.zte
  Cc: ericvh, lucho, v9fs-developer, linux-kernel, ran.xiaokai, Zeal Robot

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>


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-08-24 10:21 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-24  7:45 [PATCH] fs: 9q: remove unnecessary label "out_err" cgel.zte
2021-08-24  7:55 ` asmadeus
2021-08-24 10:21   ` Jeff Layton

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