diff options
-rw-r--r-- | sys/fs/cd9660/cd9660_vnops.c | 2 | ||||
-rw-r--r-- | sys/fs/deadfs/dead_vnops.c | 3 | ||||
-rw-r--r-- | sys/fs/devfs/devfs.h | 2 | ||||
-rw-r--r-- | sys/fs/devfs/devfs_rule.c | 2 | ||||
-rw-r--r-- | sys/fs/devfs/devfs_vnops.c | 2 | ||||
-rw-r--r-- | sys/fs/fifofs/fifo_vnops.c | 2 | ||||
-rw-r--r-- | sys/fs/specfs/spec_vnops.c | 2 | ||||
-rw-r--r-- | sys/fs/unionfs/union_vnops.c | 2 | ||||
-rw-r--r-- | sys/isofs/cd9660/cd9660_vnops.c | 2 |
9 files changed, 10 insertions, 9 deletions
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 148d5a7..af87aaa 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -227,7 +227,7 @@ static int cd9660_ioctl(ap) struct vop_ioctl_args /* { struct vnode *a_vp; - int a_command; + u_long a_command; caddr_t a_data; int a_fflag; struct ucred *a_cred; diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c index 9678379..4cdada5 100644 --- a/sys/fs/deadfs/dead_vnops.c +++ b/sys/fs/deadfs/dead_vnops.c @@ -176,7 +176,7 @@ static int dead_ioctl(ap) struct vop_ioctl_args /* { struct vnode *a_vp; - int a_command; + u_long a_command; caddr_t a_data; int a_fflag; struct ucred *a_cred; @@ -186,6 +186,7 @@ dead_ioctl(ap) if (!chkvnlock(ap->a_vp)) return (ENOTTY); + /* XXX: Doesn't this just recurse back here ? */ return (VCALL(ap->a_vp, VOFFSET(vop_ioctl), ap)); } diff --git a/sys/fs/devfs/devfs.h b/sys/fs/devfs/devfs.h index 610417c..a30bbde 100644 --- a/sys/fs/devfs/devfs.h +++ b/sys/fs/devfs/devfs.h @@ -188,7 +188,7 @@ struct devfs_mount { void devfs_rules_apply(struct devfs_mount *dm, struct devfs_dirent *de); void devfs_rules_init(void); -int devfs_rules_ioctl(struct mount *mp, int cmd, caddr_t data, struct thread *td); +int devfs_rules_ioctl(struct mount *mp, u_long cmd, caddr_t data, struct thread *td); void devfs_rules_newmount(struct devfs_mount *dm, struct thread *td); int devfs_allocv (struct devfs_dirent *de, struct mount *mp, struct vnode **vpp, struct thread *td); dev_t *devfs_itod (int inode); diff --git a/sys/fs/devfs/devfs_rule.c b/sys/fs/devfs/devfs_rule.c index 47a0d91..a53e42e 100644 --- a/sys/fs/devfs/devfs_rule.c +++ b/sys/fs/devfs/devfs_rule.c @@ -163,7 +163,7 @@ devfs_rules_init(void) * Rule subsystem ioctl hook. */ int -devfs_rules_ioctl(struct mount *mp, int cmd, caddr_t data, struct thread *td) +devfs_rules_ioctl(struct mount *mp, u_long cmd, caddr_t data, struct thread *td) { struct devfs_mount *dm = VFSTODEVFS(mp); struct devfs_ruleset *ds; diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 8377be5..12c3f99 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -264,7 +264,7 @@ static int devfs_ioctl(ap) struct vop_ioctl_args /* { struct vnode *a_vp; - int a_command; + u_long a_command; caddr_t a_data; int a_fflag; struct ucred *a_cred; diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index 7292e56..53538ef 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/sys/fs/fifofs/fifo_vnops.c @@ -334,7 +334,7 @@ static int fifo_ioctl(ap) struct vop_ioctl_args /* { struct vnode *a_vp; - int a_command; + u_long a_command; caddr_t a_data; int a_fflag; struct ucred *a_cred; diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c index 20d44c6..51c2792 100644 --- a/sys/fs/specfs/spec_vnops.c +++ b/sys/fs/specfs/spec_vnops.c @@ -328,7 +328,7 @@ static int spec_ioctl(ap) struct vop_ioctl_args /* { struct vnode *a_vp; - int a_command; + u_long a_command; caddr_t a_data; int a_fflag; struct ucred *a_cred; diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index a1b757e..dc09095 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -1106,7 +1106,7 @@ static int union_ioctl(ap) struct vop_ioctl_args /* { struct vnode *a_vp; - int a_command; + u_long a_command; caddr_t a_data; int a_fflag; struct ucred *a_cred; diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index 148d5a7..af87aaa 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/cd9660/cd9660_vnops.c @@ -227,7 +227,7 @@ static int cd9660_ioctl(ap) struct vop_ioctl_args /* { struct vnode *a_vp; - int a_command; + u_long a_command; caddr_t a_data; int a_fflag; struct ucred *a_cred; |