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)
This commit is contained in:
Roman Divacky 2009-06-25 08:52:20 +00:00
parent 3cfed08d1d
commit 670013ead1
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=194944
5 changed files with 8 additions and 8 deletions

View File

@ -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;

View File

@ -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__ */

View File

@ -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,

View File

@ -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);

View File

@ -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,