[src/netbsd-8]: src/sys/dev Pull up following revision(s) (requested by bouye...

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

details:   https://anonhg.NetBSD.org/src/rev/8132b1815ceb
branches:  netbsd-8
changeset: 446188:8132b1815ceb
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Nov 26 17:13:07 2018 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #1105):
        sys/dev/dksubr.c: revision 1.104
rnd_add_uint32() doens't support concurent calls for the same rnd_source,
call it with dksc->sc_iolock held.

diffstat:

 sys/dev/dksubr.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 33afcb1de1ad -r 8132b1815ceb sys/dev/dksubr.c
--- a/sys/dev/dksubr.c  Sat Nov 24 23:51:05 2018 +0000
+++ b/sys/dev/dksubr.c  Mon Nov 26 17:13:07 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.97.2.1 2017/09/01 09:59:10 martin Exp $ */
+/* $NetBSD: dksubr.c,v 1.97.2.2 2018/11/26 17:13:07 snj Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.97.2.1 2017/09/01 09:59:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.97.2.2 2018/11/26 17:13:07 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -459,11 +459,11 @@
        if (lock)
                mutex_enter(&dksc->sc_iolock);
        disk_unbusy(dk, bp->b_bcount - bp->b_resid, (bp->b_flags & B_READ));
-       if (lock)
-               mutex_exit(&dksc->sc_iolock);
 
        if ((dksc->sc_flags & DKF_NO_RND) == 0)
                rnd_add_uint32(&dksc->sc_rnd_source, bp->b_rawblkno);
+       if (lock)
+               mutex_exit(&dksc->sc_iolock);
 
        biodone(bp);
 }