[src/trunk]: src/sys/uvm allocate the bufq after zeroing the swapdev structur...

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0a41b0766b60
branches:  trunk
changeset: 534467:0a41b0766b60
user:      chs <chs%NetBSD.org@localhost>
date:      Sat Jul 27 14:37:00 2002 +0000

description:
allocate the bufq after zeroing the swapdev structure, not before.

diffstat:

 sys/uvm/uvm_swap.c |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r 57b84749789b -r 0a41b0766b60 sys/uvm/uvm_swap.c
--- a/sys/uvm/uvm_swap.c        Sat Jul 27 11:09:35 2002 +0000
+++ b/sys/uvm/uvm_swap.c        Sat Jul 27 14:37:00 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_swap.c,v 1.66 2002/07/21 15:32:20 hannken Exp $    */
+/*     $NetBSD: uvm_swap.c,v 1.67 2002/07/27 14:37:00 chs Exp $        */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Matthew R. Green
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.66 2002/07/21 15:32:20 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.67 2002/07/27 14:37:00 chs Exp $");
 
 #include "fs_nfs.h"
 #include "opt_uvmhist.h"
@@ -605,6 +605,10 @@
                priority = SCARG(uap, misc);
                sdp = malloc(sizeof *sdp, M_VMSWAP, M_WAITOK);
                spp = malloc(sizeof *spp, M_VMSWAP, M_WAITOK);
+               memset(sdp, 0, sizeof(*sdp));
+               sdp->swd_flags = SWF_FAKE;
+               sdp->swd_vp = vp;
+               sdp->swd_dev = (vp->v_type == VBLK) ? vp->v_rdev : NODEV;
                bufq_alloc(&sdp->swd_tab, BUFQ_DISKSORT|BUFQ_SORT_RAWBLOCK);
                simple_lock(&uvm.swap_data_lock);
                if (swaplist_find(vp, 0) != NULL) {
@@ -615,11 +619,6 @@
                        free(spp, M_VMSWAP);
                        break;
                }
-               memset(sdp, 0, sizeof(*sdp));
-               sdp->swd_flags = SWF_FAKE;      /* placeholder only */
-               sdp->swd_vp = vp;
-               sdp->swd_dev = (vp->v_type == VBLK) ? vp->v_rdev : NODEV;
-
                swaplist_insert(sdp, spp, priority);
                simple_unlock(&uvm.swap_data_lock);