Module Name: src
Committed By: snj
Date: Mon Nov 26 17:13:07 UTC 2018
Modified Files:
src/sys/dev [netbsd-8]: dksubr.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.97.2.1 -r1.97.2.2 src/sys/dev/dksubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dksubr.c
diff -u src/sys/dev/dksubr.c:1.97.2.1 src/sys/dev/dksubr.c:1.97.2.2
--- src/sys/dev/dksubr.c:1.97.2.1 Fri Sep 1 09:59:10 2017
+++ src/sys/dev/dksubr.c Mon Nov 26 17:13:07 2018
@@ -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 @@ dk_done1(struct dk_softc *dksc, struct b
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);
}
