Index: kern_event.c
===================================================================
RCS file: /home/ncvs/src/sys/kern/kern_event.c,v
retrieving revision 1.79
diff -u -r1.79 kern_event.c
--- kern_event.c	16 Aug 2004 03:08:38 -0000	1.79
+++ kern_event.c	1 Sep 2004 17:27:22 -0000
@@ -859,7 +859,8 @@
 	} else if (kev->flags & EV_DELETE) {
 		kn->kn_status |= KN_INFLUX;
 		KQ_UNLOCK(kq);
-		kn->kn_fop->f_detach(kn);
+		if (!(kn->kn_status & KN_DETACHED))
+			kn->kn_fop->f_detach(kn);
 		knote_drop(kn, td);
 		goto done;
 	}
@@ -1158,7 +1159,8 @@
 			 * it _INFLUX.
 			 */
 			*kevp = kn->kn_kevent;
-			kn->kn_fop->f_detach(kn);
+			if (!(kn->kn_status & KN_DETACHED))
+				kn->kn_fop->f_detach(kn);
 			knote_drop(kn, td);
 			KQ_LOCK(kq);
 			kn = NULL;
@@ -1357,7 +1359,8 @@
 			    ("KN_INFLUX set when not suppose to be"));
 			kn->kn_status |= KN_INFLUX;
 			KQ_UNLOCK(kq);
-			kn->kn_fop->f_detach(kn);
+			if (!(kn->kn_status & KN_DETACHED))
+				kn->kn_fop->f_detach(kn);
 			knote_drop(kn, td);
 			KQ_LOCK(kq);
 		}
@@ -1369,7 +1372,8 @@
 				    ("KN_INFLUX set when not suppose to be"));
 				kn->kn_status |= KN_INFLUX;
 				KQ_UNLOCK(kq);
-				kn->kn_fop->f_detach(kn);
+				if (!(kn->kn_status & KN_DETACHED))
+					kn->kn_fop->f_detach(kn);
 				knote_drop(kn, td);
 				KQ_LOCK(kq);
 			}
@@ -1672,7 +1676,8 @@
 			}
 			kn->kn_status |= KN_INFLUX;
 			KQ_UNLOCK(kq);
-			kn->kn_fop->f_detach(kn);
+			if (!(kn->kn_status & KN_DETACHED))
+				kn->kn_fop->f_detach(kn);
 			knote_drop(kn, td);
 			influx = 1;
 			KQ_LOCK(kq);