From: Simon Schubert <corecode@dragonflybsd.org>
Date: Fri, 21 Jul 2006 00:51:13 +0000 (+0000)
Subject: - Move error exit in front of tsleep_interlock()
X-Git-Tag: v2.0.1~4660
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/2775434d9630fb3fd68ff0d82ae28d7b05417e5a

- Move error exit in front of tsleep_interlock()
- invoke tsleep_interlock and tsleep in a critical section
- release the serializer on error exit
---

diff --git a/sys/net/tap/if_tap.c b/sys/net/tap/if_tap.c
index 9606da1c8f..fe4fab3d96 100644
--- a/sys/net/tap/if_tap.c
+++ b/sys/net/tap/if_tap.c
@@ -32,7 +32,7 @@
 
 /*
  * $FreeBSD: src/sys/net/if_tap.c,v 1.3.2.3 2002/04/14 21:41:48 luigi Exp $
- * $DragonFly: src/sys/net/tap/if_tap.c,v 1.25 2006/06/13 08:12:03 dillon Exp $
+ * $DragonFly: src/sys/net/tap/if_tap.c,v 1.26 2006/07/21 00:51:13 corecode Exp $
  * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $
  */
 
@@ -618,12 +618,16 @@ tapread(dev_t dev, struct uio *uio, int flag)
 		lwkt_serialize_enter(ifp->if_serializer);
 		m0 = ifq_dequeue(&ifp->if_snd, NULL);
 		if (m0 == NULL) {
+			if (flag & IO_NDELAY) {
+				lwkt_serialize_exit(ifp->if_serializer);
+				return (EWOULDBLOCK);
+			}
 			tp->tap_flags |= TAP_RWAIT;
+			crit_enter();
 			tsleep_interlock(tp);
 			lwkt_serialize_exit(ifp->if_serializer);
-			if (flag & IO_NDELAY)
-				return (EWOULDBLOCK);
 			error = tsleep(tp, PCATCH, "taprd", 0);
+			crit_exit();
 			if (error)
 				return (error);
 		} else {