On Fri, Jul 08, 2022 at 09:36:32AM -0700, Kuniyuki Iwashima wrote: > From: "Darrick J. Wong" <djwong@xxxxxxxxxx> > 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@xxxxxxxxxx> > > > > > > > > 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@xxxxxxxxxx> > > > > Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx> > > > > Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx> > > > > Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> > > > > Fixes: 7dcf5c3e4527 ("xfs: add RENAME_WHITEOUT support") > > > > Reported-by: Ayushman Dutta <ayudutta@xxxxxxxxxx> > > > > Signed-off-by: Kuniyuki Iwashima <kuniyu@xxxxxxxxxx> > > > > > > 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