On Wed, Feb 03, 2021 at 06:42:15PM +0100, Christian Brauner wrote: > On Wed, Feb 03, 2021 at 09:38:35AM -0800, Darrick J. Wong wrote: > > On Wed, Feb 03, 2021 at 06:30:10PM +0100, Christian Brauner wrote: > > > From: Christoph Hellwig <hch@xxxxxx> > > > > > > The mp variable in xfs_file_compat_ioctl is only used when > > > BROKEN_X86_ALIGNMENT is define. Remove it and just open code the > > > dereference in a few places. > > > > > > Fixes: f736d93d76d3 ("xfs: support idmapped mounts") > > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > > > Acked-by: Christian Brauner <christian.brauner@xxxxxxxxxx> > > > --- > > > As mentioned in the thread, I'd take this on top of Christoph's patch if > > > people are ok with this: > > > https://git.kernel.org/brauner/h/idmapped_mounts > > > > I don't mind taking this via the xfs tree, unless merging through the > > idmapped mounts series is easier/causes less rebase mess? > > It's caused by Christoph's xfs conversion patch as he's changing the one > place where "mp" was passed outside the BROKEN_X86_ALIGNMENT ifdef to a > struct file as arg. So I'd just apply it on top of that if you don't > mind. Would make it easier for Stephen Rothwell too as he's dealing with > all the merge conflicts. :) Works for me; I'm 100% ok with it going through your tree. :) --D > > > > > Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx> > > Tyvm! > Christian