From: CGEL <[email protected]>
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 <[email protected]>
Signed-off-by: CGEL <[email protected]>
---
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
[email protected] wrote on Tue, Aug 24, 2021 at 12:45:03AM -0700:
> From: CGEL <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: CGEL <[email protected]>
> ---
> 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
On Tue, 2021-08-24 at 16:55 +0900, [email protected] wrote:
> [email protected] wrote on Tue, Aug 24, 2021 at 12:45:03AM -0700:
> > From: CGEL <[email protected]>
> >
> > 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 <[email protected]>
> > Signed-off-by: CGEL <[email protected]>
> > ---
> > 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 <[email protected]>