mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
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: f736d93d76
("xfs: support idmapped mounts")
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
parent
f736d93d76
commit
f69e8091c4
1 changed files with 3 additions and 4 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue