[PATCH -next] xfs: remove the possibly unused mp variable in xfs_file_compat_ioctl

[PATCH -next] xfs: remove the possibly unused mp variable in xfs_file_compat_ioctl

[Christian Brauner]

From: Christoph Hellwig <hch@lst.de>

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@lst.de>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
---
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
---
 fs/xfs/xfs_ioctl32.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
index 926427b19573..33c09ec8e6c0 100644
--- a/fs/xfs/xfs_ioctl32.c
+++ b/fs/xfs/xfs_ioctl32.c
@@ -438,7 +438,6 @@ xfs_file_compat_ioctl(
 {
 	struct inode		*inode = file_inode(filp);
 	struct xfs_inode	*ip = XFS_I(inode);
-	struct xfs_mount	*mp = ip->i_mount;
 	void			__user *arg = compat_ptr(p);
 	int			error;
 
@@ -458,7 +457,7 @@ xfs_file_compat_ioctl(
 		return xfs_ioc_space(filp, &bf);
 	}
 	case XFS_IOC_FSGEOMETRY_V1_32:
-		return xfs_compat_ioc_fsgeometry_v1(mp, arg);
+		return xfs_compat_ioc_fsgeometry_v1(ip->i_mount, arg);
 	case XFS_IOC_FSGROWFSDATA_32: {
 		struct xfs_growfs_data	in;
 
@@ -467,7 +466,7 @@ xfs_file_compat_ioctl(
 		error = mnt_want_write_file(filp);
 		if (error)
 			return error;
-		error = xfs_growfs_data(mp, &in);
+		error = xfs_growfs_data(ip->i_mount, &in);
 		mnt_drop_write_file(filp);
 		return error;
 	}
@@ -479,7 +478,7 @@ xfs_file_compat_ioctl(
 		error = mnt_want_write_file(filp);
 		if (error)
 			return error;
-		error = xfs_growfs_rt(mp, &in);
+		error = xfs_growfs_rt(ip->i_mount, &in);
 		mnt_drop_write_file(filp);
 		return error;
 	}

base-commit: f736d93d76d3e97d6986c6d26c8eaa32536ccc5c
-- 
2.30.0

Re: [PATCH -next] xfs: remove the possibly unused mp variable in xfs_file_compat_ioctl

[Darrick J. Wong]

On Wed, Feb 03, 2021 at 06:30:10PM +0100, Christian Brauner wrote:
> From: Christoph Hellwig <hch@lst.de>
> 
> 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@lst.de>
> Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
> ---
> 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?

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

--D

> ---
>  fs/xfs/xfs_ioctl32.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
> index 926427b19573..33c09ec8e6c0 100644
> --- a/fs/xfs/xfs_ioctl32.c
> +++ b/fs/xfs/xfs_ioctl32.c
> @@ -438,7 +438,6 @@ xfs_file_compat_ioctl(
>  {
>  	struct inode		*inode = file_inode(filp);
>  	struct xfs_inode	*ip = XFS_I(inode);
> -	struct xfs_mount	*mp = ip->i_mount;
>  	void			__user *arg = compat_ptr(p);
>  	int			error;
>  
> @@ -458,7 +457,7 @@ xfs_file_compat_ioctl(
>  		return xfs_ioc_space(filp, &bf);
>  	}
>  	case XFS_IOC_FSGEOMETRY_V1_32:
> -		return xfs_compat_ioc_fsgeometry_v1(mp, arg);
> +		return xfs_compat_ioc_fsgeometry_v1(ip->i_mount, arg);
>  	case XFS_IOC_FSGROWFSDATA_32: {
>  		struct xfs_growfs_data	in;
>  
> @@ -467,7 +466,7 @@ xfs_file_compat_ioctl(
>  		error = mnt_want_write_file(filp);
>  		if (error)
>  			return error;
> -		error = xfs_growfs_data(mp, &in);
> +		error = xfs_growfs_data(ip->i_mount, &in);
>  		mnt_drop_write_file(filp);
>  		return error;
>  	}
> @@ -479,7 +478,7 @@ xfs_file_compat_ioctl(
>  		error = mnt_want_write_file(filp);
>  		if (error)
>  			return error;
> -		error = xfs_growfs_rt(mp, &in);
> +		error = xfs_growfs_rt(ip->i_mount, &in);
>  		mnt_drop_write_file(filp);
>  		return error;
>  	}
> 
> base-commit: f736d93d76d3e97d6986c6d26c8eaa32536ccc5c
> -- 
> 2.30.0
> 

Re: [PATCH -next] xfs: remove the possibly unused mp variable in xfs_file_compat_ioctl

[Christian Brauner]

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@lst.de>
> > 
> > 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@lst.de>
> > Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
> > ---
> > 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. :)

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

Tyvm!
Christian

Re: [PATCH -next] xfs: remove the possibly unused mp variable in xfs_file_compat_ioctl

[Darrick J. Wong]

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@lst.de>
> > > 
> > > 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@lst.de>
> > > Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
> > > ---
> > > 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@kernel.org>
> 
> Tyvm!
> Christian

Re: [PATCH -next] xfs: remove the possibly unused mp variable in xfs_file_compat_ioctl

[Shaokun Zhang]

It works on arm64 platform, so,

Tested-by: Shaokun Zhang <zhangshaokun@hisilicon.com>

Thanks,
Shaokun

在 2021/2/4 1:30, Christian Brauner 写道:
> From: Christoph Hellwig <hch@lst.de>
> 
> 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@lst.de>
> Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
> ---
> 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
> ---
>  fs/xfs/xfs_ioctl32.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
> index 926427b19573..33c09ec8e6c0 100644
> --- a/fs/xfs/xfs_ioctl32.c
> +++ b/fs/xfs/xfs_ioctl32.c
> @@ -438,7 +438,6 @@ xfs_file_compat_ioctl(
>  {
>  	struct inode		*inode = file_inode(filp);
>  	struct xfs_inode	*ip = XFS_I(inode);
> -	struct xfs_mount	*mp = ip->i_mount;
>  	void			__user *arg = compat_ptr(p);
>  	int			error;
>  
> @@ -458,7 +457,7 @@ xfs_file_compat_ioctl(
>  		return xfs_ioc_space(filp, &bf);
>  	}
>  	case XFS_IOC_FSGEOMETRY_V1_32:
> -		return xfs_compat_ioc_fsgeometry_v1(mp, arg);
> +		return xfs_compat_ioc_fsgeometry_v1(ip->i_mount, arg);
>  	case XFS_IOC_FSGROWFSDATA_32: {
>  		struct xfs_growfs_data	in;
>  
> @@ -467,7 +466,7 @@ xfs_file_compat_ioctl(
>  		error = mnt_want_write_file(filp);
>  		if (error)
>  			return error;
> -		error = xfs_growfs_data(mp, &in);
> +		error = xfs_growfs_data(ip->i_mount, &in);
>  		mnt_drop_write_file(filp);
>  		return error;
>  	}
> @@ -479,7 +478,7 @@ xfs_file_compat_ioctl(
>  		error = mnt_want_write_file(filp);
>  		if (error)
>  			return error;
> -		error = xfs_growfs_rt(mp, &in);
> +		error = xfs_growfs_rt(ip->i_mount, &in);
>  		mnt_drop_write_file(filp);
>  		return error;
>  	}
> 
> base-commit: f736d93d76d3e97d6986c6d26c8eaa32536ccc5c
>