aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2002-10-16 08:04:11 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2002-10-16 08:04:11 +0000
commitbc9d8a9a373dd93902e6e521deb34270e04fe01f (patch)
tree1ef597e1775af8008706f6276defdaa314700892 /sys
parentfcf549422d95fcbe6d5389503c0bb971031086cd (diff)
downloadsrc-bc9d8a9a373dd93902e6e521deb34270e04fe01f.tar.gz
src-bc9d8a9a373dd93902e6e521deb34270e04fe01f.zip
Fix comments and one resulting code confusion about the type of the
"command" argument to VOP_IOCTL. Spotted by: FlexeLint.
Notes
Notes: svn path=/head/; revision=105212
Diffstat (limited to 'sys')
-rw-r--r--sys/fs/cd9660/cd9660_vnops.c2
-rw-r--r--sys/fs/deadfs/dead_vnops.c3
-rw-r--r--sys/fs/devfs/devfs.h2
-rw-r--r--sys/fs/devfs/devfs_rule.c2
-rw-r--r--sys/fs/devfs/devfs_vnops.c2
-rw-r--r--sys/fs/fifofs/fifo_vnops.c2
-rw-r--r--sys/fs/specfs/spec_vnops.c2
-rw-r--r--sys/fs/unionfs/union_vnops.c2
-rw-r--r--sys/isofs/cd9660/cd9660_vnops.c2
9 files changed, 10 insertions, 9 deletions
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 148d5a7c3437..af87aaa88621 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 9678379755ad..4cdada5f8051 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 610417cec4c0..a30bbde7b427 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 47a0d91f82b9..a53e42eea368 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 8377be595d7b..12c3f99e66dd 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 7292e563f6ac..53538efb6a33 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 20d44c68b261..51c279220609 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 a1b757eda01c..dc09095e3030 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 148d5a7c3437..af87aaa88621 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;