Fix comments and one resulting code confusion about the type of the
"command" argument to VOP_IOCTL. Spotted by: FlexeLint.
This commit is contained in:
parent
fcf549422d
commit
bc9d8a9a37
@ -227,7 +227,7 @@ static int
|
|||||||
cd9660_ioctl(ap)
|
cd9660_ioctl(ap)
|
||||||
struct vop_ioctl_args /* {
|
struct vop_ioctl_args /* {
|
||||||
struct vnode *a_vp;
|
struct vnode *a_vp;
|
||||||
int a_command;
|
u_long a_command;
|
||||||
caddr_t a_data;
|
caddr_t a_data;
|
||||||
int a_fflag;
|
int a_fflag;
|
||||||
struct ucred *a_cred;
|
struct ucred *a_cred;
|
||||||
|
@ -176,7 +176,7 @@ static int
|
|||||||
dead_ioctl(ap)
|
dead_ioctl(ap)
|
||||||
struct vop_ioctl_args /* {
|
struct vop_ioctl_args /* {
|
||||||
struct vnode *a_vp;
|
struct vnode *a_vp;
|
||||||
int a_command;
|
u_long a_command;
|
||||||
caddr_t a_data;
|
caddr_t a_data;
|
||||||
int a_fflag;
|
int a_fflag;
|
||||||
struct ucred *a_cred;
|
struct ucred *a_cred;
|
||||||
@ -186,6 +186,7 @@ dead_ioctl(ap)
|
|||||||
|
|
||||||
if (!chkvnlock(ap->a_vp))
|
if (!chkvnlock(ap->a_vp))
|
||||||
return (ENOTTY);
|
return (ENOTTY);
|
||||||
|
/* XXX: Doesn't this just recurse back here ? */
|
||||||
return (VCALL(ap->a_vp, VOFFSET(vop_ioctl), ap));
|
return (VCALL(ap->a_vp, VOFFSET(vop_ioctl), ap));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -188,7 +188,7 @@ struct devfs_mount {
|
|||||||
|
|
||||||
void devfs_rules_apply(struct devfs_mount *dm, struct devfs_dirent *de);
|
void devfs_rules_apply(struct devfs_mount *dm, struct devfs_dirent *de);
|
||||||
void devfs_rules_init(void);
|
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);
|
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);
|
int devfs_allocv (struct devfs_dirent *de, struct mount *mp, struct vnode **vpp, struct thread *td);
|
||||||
dev_t *devfs_itod (int inode);
|
dev_t *devfs_itod (int inode);
|
||||||
|
@ -163,7 +163,7 @@ devfs_rules_init(void)
|
|||||||
* Rule subsystem ioctl hook.
|
* Rule subsystem ioctl hook.
|
||||||
*/
|
*/
|
||||||
int
|
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_mount *dm = VFSTODEVFS(mp);
|
||||||
struct devfs_ruleset *ds;
|
struct devfs_ruleset *ds;
|
||||||
|
@ -264,7 +264,7 @@ static int
|
|||||||
devfs_ioctl(ap)
|
devfs_ioctl(ap)
|
||||||
struct vop_ioctl_args /* {
|
struct vop_ioctl_args /* {
|
||||||
struct vnode *a_vp;
|
struct vnode *a_vp;
|
||||||
int a_command;
|
u_long a_command;
|
||||||
caddr_t a_data;
|
caddr_t a_data;
|
||||||
int a_fflag;
|
int a_fflag;
|
||||||
struct ucred *a_cred;
|
struct ucred *a_cred;
|
||||||
|
@ -334,7 +334,7 @@ static int
|
|||||||
fifo_ioctl(ap)
|
fifo_ioctl(ap)
|
||||||
struct vop_ioctl_args /* {
|
struct vop_ioctl_args /* {
|
||||||
struct vnode *a_vp;
|
struct vnode *a_vp;
|
||||||
int a_command;
|
u_long a_command;
|
||||||
caddr_t a_data;
|
caddr_t a_data;
|
||||||
int a_fflag;
|
int a_fflag;
|
||||||
struct ucred *a_cred;
|
struct ucred *a_cred;
|
||||||
|
@ -328,7 +328,7 @@ static int
|
|||||||
spec_ioctl(ap)
|
spec_ioctl(ap)
|
||||||
struct vop_ioctl_args /* {
|
struct vop_ioctl_args /* {
|
||||||
struct vnode *a_vp;
|
struct vnode *a_vp;
|
||||||
int a_command;
|
u_long a_command;
|
||||||
caddr_t a_data;
|
caddr_t a_data;
|
||||||
int a_fflag;
|
int a_fflag;
|
||||||
struct ucred *a_cred;
|
struct ucred *a_cred;
|
||||||
|
@ -1106,7 +1106,7 @@ static int
|
|||||||
union_ioctl(ap)
|
union_ioctl(ap)
|
||||||
struct vop_ioctl_args /* {
|
struct vop_ioctl_args /* {
|
||||||
struct vnode *a_vp;
|
struct vnode *a_vp;
|
||||||
int a_command;
|
u_long a_command;
|
||||||
caddr_t a_data;
|
caddr_t a_data;
|
||||||
int a_fflag;
|
int a_fflag;
|
||||||
struct ucred *a_cred;
|
struct ucred *a_cred;
|
||||||
|
@ -227,7 +227,7 @@ static int
|
|||||||
cd9660_ioctl(ap)
|
cd9660_ioctl(ap)
|
||||||
struct vop_ioctl_args /* {
|
struct vop_ioctl_args /* {
|
||||||
struct vnode *a_vp;
|
struct vnode *a_vp;
|
||||||
int a_command;
|
u_long a_command;
|
||||||
caddr_t a_data;
|
caddr_t a_data;
|
||||||
int a_fflag;
|
int a_fflag;
|
||||||
struct ucred *a_cred;
|
struct ucred *a_cred;
|
||||||
|
Loading…
Reference in New Issue
Block a user