Unverified Commit f69e8091 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christian Brauner
Browse files

xfs: remove the possibly unused mp variable in xfs_file_compat_ioctl 

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.

Link: https://lore.kernel.org/r/20210203173009.462205-1-christian.brauner@ubuntu.com


Fixes: f736d93d ("xfs: support idmapped mounts")
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Acked-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
parent f736d93d

fs/xfs/xfs_ioctl32.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

	}