CVS commit: src/sys

[Mindaugas Rasiukevicius]

Module Name:    src
Committed By:   rmind
Date:           Tue Oct 27 02:58:29 UTC 2009

Modified Files:
        src/sys/kern: kern_descrip.c kern_lwp.c
        src/sys/sys: filedesc.h

Log Message:
- Amend fd_hold() to take an argument and add assert (reflects two cases,
  fork1() and the rest, e.g. kthread_create(), when creating from lwp0).

- lwp_create(): do not touch filedesc internals, use fd_hold().


To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/sys/kern/kern_descrip.c
cvs rdiff -u -r1.135 -r1.136 src/sys/kern/kern_lwp.c
cvs rdiff -u -r1.56 -r1.57 src/sys/sys/filedesc.h

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/kern_descrip.c
diff -u src/sys/kern/kern_descrip.c:1.199 src/sys/kern/kern_descrip.c:1.200
--- src/sys/kern/kern_descrip.c:1.199	Sun Aug 16 11:00:20 2009
+++ src/sys/kern/kern_descrip.c	Tue Oct 27 02:58:28 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_descrip.c,v 1.199 2009/08/16 11:00:20 yamt Exp $	*/
+/*	$NetBSD: kern_descrip.c,v 1.200 2009/10/27 02:58:28 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.199 2009/08/16 11:00:20 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.200 2009/10/27 02:58:28 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1326,10 +1326,12 @@
  * Acquire a hold on a filedesc structure.
  */
 void
-fd_hold(void)
+fd_hold(lwp_t *l)
 {
+	filedesc_t *fdp = l->l_fd;
 
-	atomic_inc_uint(&curlwp->l_fd->fd_refcnt);
+	KASSERT(fdp == curlwp->l_fd || fdp == lwp0.l_fd);
+	atomic_inc_uint(&fdp->fd_refcnt);
 }
 
 /*

Index: src/sys/kern/kern_lwp.c
diff -u src/sys/kern/kern_lwp.c:1.135 src/sys/kern/kern_lwp.c:1.136
--- src/sys/kern/kern_lwp.c:1.135	Thu Oct 22 22:28:57 2009
+++ src/sys/kern/kern_lwp.c	Tue Oct 27 02:58:28 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_lwp.c,v 1.135 2009/10/22 22:28:57 rmind Exp $	*/
+/*	$NetBSD: kern_lwp.c,v 1.136 2009/10/27 02:58:28 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -209,7 +209,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.135 2009/10/22 22:28:57 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.136 2009/10/27 02:58:28 rmind Exp $");
 
 #include "opt_ddb.h"
 #include "opt_lockdebug.h"
@@ -606,7 +606,7 @@
 	l2->l_fd = p2->p_fd;
 	if (p2->p_nlwps != 0) {
 		KASSERT(l1->l_proc == p2);
-		atomic_inc_uint(&l2->l_fd->fd_refcnt);
+		fd_hold(l2);
 	} else {
 		KASSERT(l1->l_proc != p2);
 	}

Index: src/sys/sys/filedesc.h
diff -u src/sys/sys/filedesc.h:1.56 src/sys/sys/filedesc.h:1.57
--- src/sys/sys/filedesc.h:1.56	Mon May 25 03:59:45 2009
+++ src/sys/sys/filedesc.h	Tue Oct 27 02:58:28 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: filedesc.h,v 1.56 2009/05/25 03:59:45 yamt Exp $	*/
+/*	$NetBSD: filedesc.h,v 1.57 2009/10/27 02:58:28 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -190,7 +190,7 @@
 filedesc_t *fd_copy(void);
 filedesc_t *fd_init(filedesc_t *);
 void	fd_share(proc_t *);
-void	fd_hold(void);
+void	fd_hold(lwp_t *);
 void	fd_free(void);
 void	fd_closeexec(void);
 int	fd_checkstd(void);