Module Name: src
Committed By: rmind
Date: Fri Apr 15 00:01:48 UTC 2011
Modified Files:
src/sys/kern: uipc_sem.c
Log Message:
sys__ksem_close: use fd_close().
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/kern/uipc_sem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_sem.c
diff -u src/sys/kern/uipc_sem.c:1.32 src/sys/kern/uipc_sem.c:1.33
--- src/sys/kern/uipc_sem.c:1.32 Thu Apr 14 00:32:23 2011
+++ src/sys/kern/uipc_sem.c Fri Apr 15 00:01:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_sem.c,v 1.32 2011/04/14 00:32:23 rmind Exp $ */
+/* $NetBSD: uipc_sem.c,v 1.33 2011/04/15 00:01:48 rmind Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.32 2011/04/14 00:32:23 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.33 2011/04/15 00:01:48 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -490,9 +490,12 @@
/* {
intptr_t id;
} */
- struct sys_close_args cuap;
- SCARG(&cuap, fd) = SCARG(uap, id);
- return sys_close(l, (const void *)&cuap, retval);
+ int fd = (int)SCARG(uap, id);
+
+ if (fd_getfile(fd) == NULL) {
+ return EBADF;
+ }
+ return fd_close(fd);
}
static int
