Thu Apr 14 00:32:23 2011 UTC ()

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


(rmind)

diff -r1.31 -r1.32 src/sys/kern/uipc_sem.c

--- src/sys/kern/uipc_sem.c 2011/04/12 20:37:25	1.31
+++ src/sys/kern/uipc_sem.c 2011/04/14 00:32:23	1.32

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -50,27 +50,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Implementation of POSIX semaphore.
  */
 #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>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/ksem.h>
 #include <sys/syscall.h>
 #include <sys/stat.h>
 #include <sys/kmem.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/kauth.h>
 @@ -450,27 +450,27 @@ do_ksem_open(struct lwp *l, const char *
 			KASSERT(ksnew == NULL);
 			error = ENOENT;
 			goto err;
+		}
 		/* Check for the limit locked. */
 		if (nsems >= ksem_max) {
 			mutex_exit(&ksem_lock);
 			error = ENFILE;
 			goto err;
+		}
 		/*
-		 * Finally, insert semaphore into the hash.
+		 * Finally, insert semaphore into the list.
 		 * Note: it already has the initial reference.
 		 */
 		ks = ksnew;
 		LIST_INSERT_HEAD(&ksem_head, ks, ks_entry);
 		nsems++;
 		mutex_exit(&ksem_lock);
 		ksnew = NULL;
+	}
 	KASSERT(ks != NULL);
 	fp->f_data = ks;
 	fd_affix(p, fp, fd);
 err:
 @@ -666,41 +666,39 @@ sys__ksem_getvalue(struct lwp *l, const
 	fd_putfile(fd);
 	return copyout(&val, SCARG(uap, value), sizeof(val));
+}
 int
 sys__ksem_destroy(struct lwp *l, const struct sys__ksem_destroy_args *uap,
     register_t *retval)
+{
 	/* {
 		intptr_t id;
 	} */
 	int fd = (int)SCARG(uap, id), error;
 	struct sys_close_args cuap;
 	ksem_t *ks;
 	error = ksem_get(fd, &ks);
 	if (error) {
 		return error;
+	}
 	KASSERT(mutex_owned(&ks->ks_lock));
 	/* Operation is only for unnamed semaphores. */
 	if (ks->ks_name != NULL) {
 		error = EINVAL;
 		goto out;
+	}
 	/* Cannot destroy if there are waiters. */
 	if (ks->ks_waiters) {
 		error = EBUSY;
 		goto out;
+	}
 out:
 	mutex_exit(&ks->ks_lock);
 	fd_putfile(fd);
 	if (error) {
 		fd_putfile(fd);
 		return error;
+	}
-	SCARG(&cuap, fd) = fd;
+	return fd_close(fd);
 	return sys_close(l, (const void *)&cuap, retval);
+}