[PATCH stable 5.15] xfs: remove incorrect ASSERT in xfs_rename

[PATCH stable 5.15] xfs: remove incorrect ASSERT in xfs_rename

[Kuniyuki Iwashima]

From: Eric Sandeen <sandeen@redhat.com>

commit e445976537ad139162980bee015b7364e5b64fff upstream.

Ayushman Dutta reported our 5.10 kernel hit the warning.  It was because
the original commit misses a Fixes tag and was not backported to the stable
tree.  The fix is merged in 5.16, so please backport it to 5.15 first.

This ASSERT in xfs_rename is a) incorrect, because
(RENAME_WHITEOUT|RENAME_NOREPLACE) is a valid combination, and
b) unnecessary, because actual invalid flag combinations are already
handled at the vfs level in do_renameat2() before we get called.
So, remove it.

Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Fixes: 7dcf5c3e4527 ("xfs: add RENAME_WHITEOUT support")
Reported-by: Ayushman Dutta <ayudutta@amazon.com>
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
---
I will send another patch for 4.9 - 5.4 because of a conflict with idmapped
mount changes.
---
 fs/xfs/xfs_inode.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 2477e301fa82..c19f3ca605af 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -3128,7 +3128,6 @@ xfs_rename(
 	 * appropriately.
 	 */
 	if (flags & RENAME_WHITEOUT) {
-		ASSERT(!(flags & (RENAME_NOREPLACE | RENAME_EXCHANGE)));
 		error = xfs_rename_alloc_whiteout(mnt_userns, target_dp, &wip);
 		if (error)
 			return error;
-- 
2.30.2

Re: [PATCH stable 5.15] xfs: remove incorrect ASSERT in xfs_rename

[Darrick J. Wong]

On Thu, Jul 07, 2022 at 03:58:35PM -0700, Kuniyuki Iwashima wrote:
> From: Eric Sandeen <sandeen@redhat.com>
> 
> commit e445976537ad139162980bee015b7364e5b64fff upstream.
> 
> Ayushman Dutta reported our 5.10 kernel hit the warning.  It was because
> the original commit misses a Fixes tag and was not backported to the stable
> tree.  The fix is merged in 5.16, so please backport it to 5.15 first.
> 
> This ASSERT in xfs_rename is a) incorrect, because
> (RENAME_WHITEOUT|RENAME_NOREPLACE) is a valid combination, and
> b) unnecessary, because actual invalid flag combinations are already
> handled at the vfs level in do_renameat2() before we get called.
> So, remove it.
> 
> Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> Fixes: 7dcf5c3e4527 ("xfs: add RENAME_WHITEOUT support")
> Reported-by: Ayushman Dutta <ayudutta@amazon.com>
> Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>

Looks good to me, but you really ought to send 5.10 patches to the 5.10
XFS maintainer (Amir, now cc'd).  (Yes, this is a recent change.) ;)

Acked-by: Darrick J. Wong <djwong@kernel.org>

--D

> ---
> I will send another patch for 4.9 - 5.4 because of a conflict with idmapped
> mount changes.
> ---
>  fs/xfs/xfs_inode.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 2477e301fa82..c19f3ca605af 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -3128,7 +3128,6 @@ xfs_rename(
>  	 * appropriately.
>  	 */
>  	if (flags & RENAME_WHITEOUT) {
> -		ASSERT(!(flags & (RENAME_NOREPLACE | RENAME_EXCHANGE)));
>  		error = xfs_rename_alloc_whiteout(mnt_userns, target_dp, &wip);
>  		if (error)
>  			return error;
> -- 
> 2.30.2
> 

Re: [PATCH stable 5.15] xfs: remove incorrect ASSERT in xfs_rename

[Darrick J. Wong]

On Fri, Jul 08, 2022 at 08:54:13AM -0700, Darrick J. Wong wrote:
> On Thu, Jul 07, 2022 at 03:58:35PM -0700, Kuniyuki Iwashima wrote:
> > From: Eric Sandeen <sandeen@redhat.com>
> > 
> > commit e445976537ad139162980bee015b7364e5b64fff upstream.
> > 
> > Ayushman Dutta reported our 5.10 kernel hit the warning.  It was because
> > the original commit misses a Fixes tag and was not backported to the stable
> > tree.  The fix is merged in 5.16, so please backport it to 5.15 first.
> > 
> > This ASSERT in xfs_rename is a) incorrect, because
> > (RENAME_WHITEOUT|RENAME_NOREPLACE) is a valid combination, and
> > b) unnecessary, because actual invalid flag combinations are already
> > handled at the vfs level in do_renameat2() before we get called.
> > So, remove it.
> > 
> > Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> > Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> > Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> > Fixes: 7dcf5c3e4527 ("xfs: add RENAME_WHITEOUT support")
> > Reported-by: Ayushman Dutta <ayudutta@amazon.com>
> > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
> 
> Looks good to me, but you really ought to send 5.10 patches to the 5.10
> XFS maintainer (Amir, now cc'd).  (Yes, this is a recent change.) ;)

...and of course the first thing that happens is that I mix up the 5.10
and 5.15 patches.

Amir is the 5.10 maintainer, Leah is the 5.15 maintainer.  Sorry about
the mixup.  /me pours himself a third(!) cup of coffee.

--D

> Acked-by: Darrick J. Wong <djwong@kernel.org>
> 
> --D
> 
> > ---
> > I will send another patch for 4.9 - 5.4 because of a conflict with idmapped
> > mount changes.
> > ---
> >  fs/xfs/xfs_inode.c | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> > index 2477e301fa82..c19f3ca605af 100644
> > --- a/fs/xfs/xfs_inode.c
> > +++ b/fs/xfs/xfs_inode.c
> > @@ -3128,7 +3128,6 @@ xfs_rename(
> >  	 * appropriately.
> >  	 */
> >  	if (flags & RENAME_WHITEOUT) {
> > -		ASSERT(!(flags & (RENAME_NOREPLACE | RENAME_EXCHANGE)));
> >  		error = xfs_rename_alloc_whiteout(mnt_userns, target_dp, &wip);
> >  		if (error)
> >  			return error;
> > -- 
> > 2.30.2
> > 

Re: [PATCH stable 5.15] xfs: remove incorrect ASSERT in xfs_rename

[Kuniyuki Iwashima]

From:   "Darrick J. Wong" <djwong@kernel.org>
Date:   Fri, 8 Jul 2022 08:55:57 -0700
> On Fri, Jul 08, 2022 at 08:54:13AM -0700, Darrick J. Wong wrote:
> > On Thu, Jul 07, 2022 at 03:58:35PM -0700, Kuniyuki Iwashima wrote:
> > > From: Eric Sandeen <sandeen@redhat.com>
> > > 
> > > commit e445976537ad139162980bee015b7364e5b64fff upstream.
> > > 
> > > Ayushman Dutta reported our 5.10 kernel hit the warning.  It was because
> > > the original commit misses a Fixes tag and was not backported to the stable
> > > tree.  The fix is merged in 5.16, so please backport it to 5.15 first.
> > > 
> > > This ASSERT in xfs_rename is a) incorrect, because
> > > (RENAME_WHITEOUT|RENAME_NOREPLACE) is a valid combination, and
> > > b) unnecessary, because actual invalid flag combinations are already
> > > handled at the vfs level in do_renameat2() before we get called.
> > > So, remove it.
> > > 
> > > Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> > > Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> > > Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> > > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> > > Fixes: 7dcf5c3e4527 ("xfs: add RENAME_WHITEOUT support")
> > > Reported-by: Ayushman Dutta <ayudutta@amazon.com>
> > > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
> > 
> > Looks good to me, but you really ought to send 5.10 patches to the 5.10
> > XFS maintainer (Amir, now cc'd).  (Yes, this is a recent change.) ;)
> 
> ...and of course the first thing that happens is that I mix up the 5.10
> and 5.15 patches.
> 
> Amir is the 5.10 maintainer, Leah is the 5.15 maintainer.  Sorry about
> the mixup.  /me pours himself a third(!) cup of coffee.

Thank you for taking a look!

And sorry that I'm not familiar with xfs workflow and didn't know each
version has dedicated maintainers.

Is there a doc like Documentation/process/maintainer-netdev.rst as both of
Amir and Leah seem not listed in the xfs entry of MAINTAINERS...?

Re: [PATCH stable 5.15] xfs: remove incorrect ASSERT in xfs_rename

[Darrick J. Wong]

On Fri, Jul 08, 2022 at 09:36:32AM -0700, Kuniyuki Iwashima wrote:
> From:   "Darrick J. Wong" <djwong@kernel.org>
> Date:   Fri, 8 Jul 2022 08:55:57 -0700
> > On Fri, Jul 08, 2022 at 08:54:13AM -0700, Darrick J. Wong wrote:
> > > On Thu, Jul 07, 2022 at 03:58:35PM -0700, Kuniyuki Iwashima wrote:
> > > > From: Eric Sandeen <sandeen@redhat.com>
> > > > 
> > > > commit e445976537ad139162980bee015b7364e5b64fff upstream.
> > > > 
> > > > Ayushman Dutta reported our 5.10 kernel hit the warning.  It was because
> > > > the original commit misses a Fixes tag and was not backported to the stable
> > > > tree.  The fix is merged in 5.16, so please backport it to 5.15 first.
> > > > 
> > > > This ASSERT in xfs_rename is a) incorrect, because
> > > > (RENAME_WHITEOUT|RENAME_NOREPLACE) is a valid combination, and
> > > > b) unnecessary, because actual invalid flag combinations are already
> > > > handled at the vfs level in do_renameat2() before we get called.
> > > > So, remove it.
> > > > 
> > > > Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> > > > Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> > > > Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> > > > Fixes: 7dcf5c3e4527 ("xfs: add RENAME_WHITEOUT support")
> > > > Reported-by: Ayushman Dutta <ayudutta@amazon.com>
> > > > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
> > > 
> > > Looks good to me, but you really ought to send 5.10 patches to the 5.10
> > > XFS maintainer (Amir, now cc'd).  (Yes, this is a recent change.) ;)
> > 
> > ...and of course the first thing that happens is that I mix up the 5.10
> > and 5.15 patches.
> > 
> > Amir is the 5.10 maintainer, Leah is the 5.15 maintainer.  Sorry about
> > the mixup.  /me pours himself a third(!) cup of coffee.
> 
> Thank you for taking a look!
> 
> And sorry that I'm not familiar with xfs workflow and didn't know each
> version has dedicated maintainers.

It's a recent change, because I wasn't keeping up with tending to six
LTS trees /and/ upstream /and/ feature development.

> Is there a doc like Documentation/process/maintainer-netdev.rst as both of
> Amir and Leah seem not listed in the xfs entry of MAINTAINERS...?

They're listed in MAINTAINERS in the 5.10 and 5.15 trees, respectively.
That's also a very recent change (within the last week, I think).

--D

Re: [PATCH stable 5.15] xfs: remove incorrect ASSERT in xfs_rename

[Kuniyuki Iwashima]

From:   "Darrick J. Wong" <djwong@kernel.org>
Date:   Fri, 8 Jul 2022 09:51:56 -0700
> On Fri, Jul 08, 2022 at 09:36:32AM -0700, Kuniyuki Iwashima wrote:
> > From:   "Darrick J. Wong" <djwong@kernel.org>
> > Date:   Fri, 8 Jul 2022 08:55:57 -0700
> > > On Fri, Jul 08, 2022 at 08:54:13AM -0700, Darrick J. Wong wrote:
> > > > On Thu, Jul 07, 2022 at 03:58:35PM -0700, Kuniyuki Iwashima wrote:
> > > > > From: Eric Sandeen <sandeen@redhat.com>
> > > > > 
> > > > > commit e445976537ad139162980bee015b7364e5b64fff upstream.
> > > > > 
> > > > > Ayushman Dutta reported our 5.10 kernel hit the warning.  It was because
> > > > > the original commit misses a Fixes tag and was not backported to the stable
> > > > > tree.  The fix is merged in 5.16, so please backport it to 5.15 first.
> > > > > 
> > > > > This ASSERT in xfs_rename is a) incorrect, because
> > > > > (RENAME_WHITEOUT|RENAME_NOREPLACE) is a valid combination, and
> > > > > b) unnecessary, because actual invalid flag combinations are already
> > > > > handled at the vfs level in do_renameat2() before we get called.
> > > > > So, remove it.
> > > > > 
> > > > > Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> > > > > Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> > > > > Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> > > > > Fixes: 7dcf5c3e4527 ("xfs: add RENAME_WHITEOUT support")
> > > > > Reported-by: Ayushman Dutta <ayudutta@amazon.com>
> > > > > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
> > > > 
> > > > Looks good to me, but you really ought to send 5.10 patches to the 5.10
> > > > XFS maintainer (Amir, now cc'd).  (Yes, this is a recent change.) ;)
> > > 
> > > ...and of course the first thing that happens is that I mix up the 5.10
> > > and 5.15 patches.
> > > 
> > > Amir is the 5.10 maintainer, Leah is the 5.15 maintainer.  Sorry about
> > > the mixup.  /me pours himself a third(!) cup of coffee.
> > 
> > Thank you for taking a look!
> > 
> > And sorry that I'm not familiar with xfs workflow and didn't know each
> > version has dedicated maintainers.
> 
> It's a recent change, because I wasn't keeping up with tending to six
> LTS trees /and/ upstream /and/ feature development.

It must have been really hard, that makes sense.


> > Is there a doc like Documentation/process/maintainer-netdev.rst as both of
> > Amir and Leah seem not listed in the xfs entry of MAINTAINERS...?
> 
> They're listed in MAINTAINERS in the 5.10 and 5.15 trees, respectively.
> That's also a very recent change (within the last week, I think).

Ah, I got it.  I'm sorry it was because I used the latest get_maintainer.pl
only.  I'll check each branch's MAINTAINERS next time.

Thank you!

Re: [PATCH stable 5.15] xfs: remove incorrect ASSERT in xfs_rename

[Leah Rumancik]

On Fri, Jul 08, 2022 at 08:54:13AM -0700, Darrick J. Wong wrote:
> On Thu, Jul 07, 2022 at 03:58:35PM -0700, Kuniyuki Iwashima wrote:
> > From: Eric Sandeen <sandeen@redhat.com>
> > 
> > commit e445976537ad139162980bee015b7364e5b64fff upstream.
> > 
> > Ayushman Dutta reported our 5.10 kernel hit the warning.  It was because
> > the original commit misses a Fixes tag and was not backported to the stable
> > tree.  The fix is merged in 5.16, so please backport it to 5.15 first.
> > 
> > This ASSERT in xfs_rename is a) incorrect, because
> > (RENAME_WHITEOUT|RENAME_NOREPLACE) is a valid combination, and
> > b) unnecessary, because actual invalid flag combinations are already
> > handled at the vfs level in do_renameat2() before we get called.
> > So, remove it.
> > 
> > Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> > Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> > Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> > Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> > Fixes: 7dcf5c3e4527 ("xfs: add RENAME_WHITEOUT support")
> > Reported-by: Ayushman Dutta <ayudutta@amazon.com>
> > Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
> 
> Looks good to me, but you really ought to send 5.10 patches to the 5.10
> XFS maintainer (Amir, now cc'd).  (Yes, this is a recent change.) ;)
> 
> Acked-by: Darrick J. Wong <djwong@kernel.org>
> 
> --D

This patch is actually part of the next set of 10 patches being testing
for the 5.15 branch :) It would have been going out in the next week or
two, but since this is such a minor change, we can just go ahead with it.

- Leah
> 
> > ---
> > I will send another patch for 4.9 - 5.4 because of a conflict with idmapped
> > mount changes.
> > ---
> >  fs/xfs/xfs_inode.c | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> > index 2477e301fa82..c19f3ca605af 100644
> > --- a/fs/xfs/xfs_inode.c
> > +++ b/fs/xfs/xfs_inode.c
> > @@ -3128,7 +3128,6 @@ xfs_rename(
> >  	 * appropriately.
> >  	 */
> >  	if (flags & RENAME_WHITEOUT) {
> > -		ASSERT(!(flags & (RENAME_NOREPLACE | RENAME_EXCHANGE)));
> >  		error = xfs_rename_alloc_whiteout(mnt_userns, target_dp, &wip);
> >  		if (error)
> >  			return error;
> > -- 
> > 2.30.2
> >