Module Name:    src
Committed By:   rmind
Date:           Thu Apr 14 00:32:23 UTC 2011

Modified Files:
        src/sys/kern: uipc_sem.c

Log Message:
Minor comment fix.  Use fd_close() in sys__ksem_destroy(), it is cleaner.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 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.31 src/sys/kern/uipc_sem.c:1.32
--- src/sys/kern/uipc_sem.c:1.31	Tue Apr 12 20:37:25 2011
+++ src/sys/kern/uipc_sem.c	Thu Apr 14 00:32:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_sem.c,v 1.31 2011/04/12 20:37:25 rmind Exp $	*/
+/*	$NetBSD: uipc_sem.c,v 1.32 2011/04/14 00:32:23 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.31 2011/04/12 20:37:25 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.32 2011/04/14 00:32:23 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -460,7 +460,7 @@
 		}
 
 		/*
-		 * Finally, insert semaphore into the hash.
+		 * Finally, insert semaphore into the list.
 		 * Note: it already has the initial reference.
 		 */
 		ks = ksnew;
@@ -676,7 +676,6 @@
 		intptr_t id;
 	} */
 	int fd = (int)SCARG(uap, id), error;
-	struct sys_close_args cuap;
 	ksem_t *ks;
 
 	error = ksem_get(fd, &ks);
@@ -697,10 +696,9 @@
 	}
 out:
 	mutex_exit(&ks->ks_lock);
-	fd_putfile(fd);
 	if (error) {
+		fd_putfile(fd);
 		return error;
 	}
-	SCARG(&cuap, fd) = fd;
-	return sys_close(l, (const void *)&cuap, retval);
+	return fd_close(fd);
 }

Reply via email to