summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2013-05-31 16:15:22 +0000
committerjhb <jhb@FreeBSD.org>2013-05-31 16:15:22 +0000
commit52ec94b217b9d5dd76f334e527538e288086f837 (patch)
tree273db7eddf5eb30960acda7c324966c0b3afccc7 /sys/kern
parent5c982b2ff7f71be82885b3ed65707e98b291a541 (diff)
downloadFreeBSD-src-52ec94b217b9d5dd76f334e527538e288086f837.zip
FreeBSD-src-52ec94b217b9d5dd76f334e527538e288086f837.tar.gz
Style fixes to vn_ioctl().
Suggested by: bde
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/vfs_vnops.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 401cfe8..7eac0ef 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -1355,31 +1355,32 @@ vn_ioctl(fp, com, data, active_cred, td)
struct ucred *active_cred;
struct thread *td;
{
- struct vnode *vp = fp->f_vnode;
struct vattr vattr;
+ struct vnode *vp;
int error;
- error = ENOTTY;
+ vp = fp->f_vnode;
switch (vp->v_type) {
- case VREG:
case VDIR:
- if (com == FIONREAD) {
+ case VREG:
+ switch (com) {
+ case FIONREAD:
vn_lock(vp, LK_SHARED | LK_RETRY);
error = VOP_GETATTR(vp, &vattr, active_cred);
VOP_UNLOCK(vp, 0);
- if (!error)
+ if (error == 0)
*(int *)data = vattr.va_size - fp->f_offset;
- } else if (com == FIONBIO || com == FIOASYNC) /* XXX */
- error = 0;
- else
- error = VOP_IOCTL(vp, com, data, fp->f_flag,
- active_cred, td);
- break;
-
+ return (error);
+ case FIONBIO:
+ case FIOASYNC:
+ return (0);
+ default:
+ return (VOP_IOCTL(vp, com, data, fp->f_flag,
+ active_cred, td));
+ }
default:
- break;
+ return (ENOTTY);
}
- return (error);
}
/*
OpenPOWER on IntegriCloud