Switch cmd argument of ioctl to u_long as elsewhere in the kernel.

Propagate this change down the callchain.

Approved by:	kan (maintainer)
Approved by:	ed (mentor)

5 files changed, 8 insertions, 8 deletions

diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c b/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c
index 65a48e4..6da3774 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c
@@ -703,7 +703,7 @@ xfs_ioc_space(
 	xfs_vnode_t		*vp,
 	struct file		*filp,
 	int			flags,
-	unsigned int		cmd,
+	u_long			cmd,
 	void			__user *arg);
 
 STATIC int
@@ -749,7 +749,7 @@ xfs_ioctl(
 	struct inode		*inode,
 	struct file		*filp,
 	int			ioflags,
-	unsigned int		cmd,
+	u_long			cmd,
 	void			*arg)
 {
 	int			error;
@@ -1021,7 +1021,7 @@ xfs_ioc_space(
 	xfs_vnode_t		*vp,
 	struct file		*filp,
 	int			ioflags,
-	unsigned int		cmd,
+	u_long			cmd,
 	void			__user *arg)
 {
 	xfs_flock64_t		bf;
@@ -1455,7 +1455,7 @@ xfs_ioctl(
 	struct inode		*inode,
 	struct file		*filp,
 	int			ioflags,
-	unsigned int		cmd,
+	u_long			cmd,
 	unsigned long		arg)
 {
 	return EINVAL;
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h b/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h
index a30019e..8f585b6 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h
@@ -56,6 +56,6 @@ typedef struct xattr_namespace {
 extern struct xattr_namespace *xfs_namespaces;
 
 extern int xfs_ioctl(struct bhv_desc *, struct inode *, struct file *,
-		    int, unsigned int, void *);
+		    int, u_long, void *);
 
 #endif /* __XFS_IOPS_H__ */
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h b/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h
index 035d583..1e02bb0 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h
@@ -182,7 +182,7 @@ typedef int	(*xfs_vop_open_t)(bhv_desc_t *, struct cred *);
 typedef ssize_t (*xfs_vop_read_t)(bhv_desc_t *, uio_t *, int, struct cred *);
 typedef ssize_t (*xfs_vop_write_t)(bhv_desc_t *, uio_t *, int, struct cred *);
 typedef int	(*xfs_vop_ioctl_t)(bhv_desc_t *, struct inode *, struct file *,
-				int, unsigned int, void *);
+				int, u_long, void *);
 typedef int	(*xfs_vop_getattr_t)(bhv_desc_t *, struct xfs_vattr *, int,
 				struct cred *);
 typedef int	(*xfs_vop_setattr_t)(bhv_desc_t *, struct xfs_vattr *, int,
diff --git a/sys/gnu/fs/xfs/xfs_rw.h b/sys/gnu/fs/xfs/xfs_rw.h
index 9d2165c..34994b9 100644
--- a/sys/gnu/fs/xfs/xfs_rw.h
+++ b/sys/gnu/fs/xfs/xfs_rw.h
@@ -90,7 +90,7 @@ extern void xfs_ioerror_alert(char *func, struct xfs_mount *mp,
 extern int xfs_rwlock(bhv_desc_t *bdp, vrwlock_t write_lock);
 extern void xfs_rwunlock(bhv_desc_t *bdp, vrwlock_t write_lock);
 extern int xfs_setattr(bhv_desc_t *bdp, xfs_vattr_t *vap, int flags, cred_t *credp);
-extern int xfs_change_file_space(bhv_desc_t *bdp, int cmd, xfs_flock64_t *bf,
+extern int xfs_change_file_space(bhv_desc_t *bdp, u_long cmd, xfs_flock64_t *bf,
 				 xfs_off_t offset, cred_t *credp, int flags);
 extern int xfs_set_dmattrs(bhv_desc_t *bdp, u_int evmask, u_int16_t state,
 			   cred_t *credp);
diff --git a/sys/gnu/fs/xfs/xfs_vnodeops.c b/sys/gnu/fs/xfs/xfs_vnodeops.c
index ff9d929..4743cc7 100644
--- a/sys/gnu/fs/xfs/xfs_vnodeops.c
+++ b/sys/gnu/fs/xfs/xfs_vnodeops.c
@@ -4506,7 +4506,7 @@ xfs_free_file_space(
 int
 xfs_change_file_space(
 	bhv_desc_t	*bdp,
-	int		cmd,
+	u_long		cmd,
 	xfs_flock64_t	*bf,
 	xfs_off_t	offset,
 	cred_t		*credp,