summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2026-07-29 15:03:01 +0200
committerCarlos Maiolino <cem@kernel.org>2026-09-07 07:51:50 +0200
commit35bd2ae473869a2303198e4d0985881d2eaa1acf (patch)
tree5f9376c37f20235416f115b1f72c933610172a62
parent23f5ea3d0d036d8110ae6de4039d2e23c181d0c0 (diff)
downloadlinux-next-35bd2ae473869a2303198e4d0985881d2eaa1acf.tar.gz
linux-next-35bd2ae473869a2303198e4d0985881d2eaa1acf.zip
xfs: rename xfs_ioc_swapext to xfs_swapext
The usual convention is that the ioc_ prefix is used for direct ioctl handlers that take a user pointer. The current xfs_ioc_swapext does not fit that pattern, so rename it. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: "Darrick J. Wong" <djwong@kernel.org> Signed-off-by: Carlos Maiolino <cem@kernel.org>
-rw-r--r--fs/xfs/xfs_ioctl.c8
-rw-r--r--fs/xfs/xfs_ioctl.h4
-rw-r--r--fs/xfs/xfs_ioctl32.c2
3 files changed, 6 insertions, 8 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 4a8921f38a08..314eeec02341 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -962,10 +962,10 @@ out_free_buf:
}
int
-xfs_ioc_swapext(
- xfs_swapext_t *sxp)
+xfs_swapext(
+ struct xfs_swapext *sxp)
{
- xfs_inode_t *ip, *tip;
+ struct xfs_inode *ip, *tip;
/* Pull information for the target fd */
CLASS(fd, f)((int)sxp->sx_fdtarget);
@@ -1341,7 +1341,7 @@ xfs_file_ioctl(
error = mnt_want_write_file(filp);
if (error)
return error;
- error = xfs_ioc_swapext(&sxp);
+ error = xfs_swapext(&sxp);
mnt_drop_write_file(filp);
return error;
}
diff --git a/fs/xfs/xfs_ioctl.h b/fs/xfs/xfs_ioctl.h
index f5ed5cf9d3df..e57d8f5148bf 100644
--- a/fs/xfs/xfs_ioctl.h
+++ b/fs/xfs/xfs_ioctl.h
@@ -10,9 +10,7 @@ struct xfs_bstat;
struct xfs_ibulk;
struct xfs_inogrp;
-int
-xfs_ioc_swapext(
- xfs_swapext_t *sxp);
+int xfs_swapext(struct xfs_swapext *sxp);
extern int
xfs_fileattr_get(
diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
index c66e192448a8..250df2bbf214 100644
--- a/fs/xfs/xfs_ioctl32.c
+++ b/fs/xfs/xfs_ioctl32.c
@@ -475,7 +475,7 @@ xfs_file_compat_ioctl(
error = mnt_want_write_file(filp);
if (error)
return error;
- error = xfs_ioc_swapext(&sxp);
+ error = xfs_swapext(&sxp);
mnt_drop_write_file(filp);
return error;
}