summaryrefslogtreecommitdiffstats
path: root/sys/kern/sys_generic.c
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2004-11-14 12:04:34 +0000
committerphk <phk@FreeBSD.org>2004-11-14 12:04:34 +0000
commit39a0a1611e959bdd12cc34509e29015a39541f62 (patch)
tree20696d50ecc0cdba24ac2c254a5dc50bca5e6c48 /sys/kern/sys_generic.c
parentc61620e47ea2c3b67a511394b021fb6d9ba9e3c7 (diff)
downloadFreeBSD-src-39a0a1611e959bdd12cc34509e29015a39541f62.zip
FreeBSD-src-39a0a1611e959bdd12cc34509e29015a39541f62.tar.gz
style polish.
Diffstat (limited to 'sys/kern/sys_generic.c')
-rw-r--r--sys/kern/sys_generic.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 068e997..06db5f1 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -462,15 +462,13 @@ struct ioctl_args {
*/
/* ARGSUSED */
int
-ioctl(td, uap)
- struct thread *td;
- register struct ioctl_args *uap;
+ioctl(struct thread *td, struct ioctl_args *uap)
{
struct file *fp;
- register struct filedesc *fdp;
- register u_long com;
+ struct filedesc *fdp;
+ u_long com;
int error = 0;
- register u_int size;
+ u_int size;
caddr_t data, memp;
int tmp;
#define STK_PARAMS 128
@@ -530,7 +528,8 @@ ioctl(td, uap)
if (memp)
free(memp, M_IOCTLOPS);
fdrop(fp, td);
- goto done;
+ mtx_unlock(&Giant);
+ return (error);
}
} else {
*(caddr_t *)data = uap->data;
@@ -580,7 +579,6 @@ ioctl(td, uap)
if (memp)
free(memp, M_IOCTLOPS);
fdrop(fp, td);
-done:
mtx_unlock(&Giant);
return (error);
}
OpenPOWER on IntegriCloud