Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 16 May 2009 06:39:22 +0000 (UTC)
From:      Kip Macy <kmacy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r192188 - user/kmacy/ZFS_MFC/sys/kern
Message-ID:  <200905160639.n4G6dMY5047084@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kmacy
Date: Sat May 16 06:39:21 2009
New Revision: 192188
URL: http://svn.freebsd.org/changeset/base/192188

Log:
  make sure that td_osd always gets initialized

Modified:
  user/kmacy/ZFS_MFC/sys/kern/kern_fork.c
  user/kmacy/ZFS_MFC/sys/kern/kern_kse.c
  user/kmacy/ZFS_MFC/sys/kern/kern_thr.c

Modified: user/kmacy/ZFS_MFC/sys/kern/kern_fork.c
==============================================================================
--- user/kmacy/ZFS_MFC/sys/kern/kern_fork.c	Sat May 16 06:22:12 2009	(r192187)
+++ user/kmacy/ZFS_MFC/sys/kern/kern_fork.c	Sat May 16 06:39:21 2009	(r192188)
@@ -505,9 +505,9 @@ again:
 	bzero(&td2->td_startzero,
 	    __rangeof(struct thread, td_startzero, td_endzero));
 
-	bzero(&td2->td_osd, sizeof(struct osd));
 	bcopy(&td->td_startcopy, &td2->td_startcopy,
 	    __rangeof(struct thread, td_startcopy, td_endcopy));
+	bzero(&td2->td_osd, sizeof(struct osd));
 
 	td2->td_sigstk = td->td_sigstk;
 	td2->td_sigmask = td->td_sigmask;

Modified: user/kmacy/ZFS_MFC/sys/kern/kern_kse.c
==============================================================================
--- user/kmacy/ZFS_MFC/sys/kern/kern_kse.c	Sat May 16 06:22:12 2009	(r192187)
+++ user/kmacy/ZFS_MFC/sys/kern/kern_kse.c	Sat May 16 06:39:21 2009	(r192188)
@@ -1014,6 +1014,7 @@ thread_alloc_spare(struct thread *td)
 	td->td_standin = spare;
 	bzero(&spare->td_startzero,
 	    __rangeof(struct thread, td_startzero, td_endzero));
+	bzero(&td2->td_osd, sizeof(struct osd));
 	spare->td_proc = td->td_proc;
 	spare->td_ucred = crhold(td->td_ucred);
 	spare->td_flags = TDF_INMEM;

Modified: user/kmacy/ZFS_MFC/sys/kern/kern_thr.c
==============================================================================
--- user/kmacy/ZFS_MFC/sys/kern/kern_thr.c	Sat May 16 06:22:12 2009	(r192187)
+++ user/kmacy/ZFS_MFC/sys/kern/kern_thr.c	Sat May 16 06:39:21 2009	(r192188)
@@ -199,6 +199,7 @@ create_thread(struct thread *td, mcontex
 	    __rangeof(struct thread, td_startzero, td_endzero));
 	bcopy(&td->td_startcopy, &newtd->td_startcopy,
 	    __rangeof(struct thread, td_startcopy, td_endcopy));
+	bzero(&td2->td_osd, sizeof(struct osd));
 	newtd->td_proc = td->td_proc;
 	newtd->td_ucred = crhold(td->td_ucred);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905160639.n4G6dMY5047084>