Merge pull request #823 from wenchengji159357/dev

jfb8856606 · web-flow · commit 66e6dbba2a14 · 2024-05-31T12:22:47.000+08:00
Dev
diff --git a/freebsd/kern/kern_event.c b/freebsd/kern/kern_event.c
@@ -1672,6 +1672,7 @@ kqueue_release(struct kqueue *kq, int locked)
 		KQ_UNLOCK(kq);
 }
 
+#ifndef FSTACK
 static void
 kqueue_schedtask(struct kqueue *kq)
 {
@@ -1685,6 +1686,7 @@ kqueue_schedtask(struct kqueue *kq)
 		kq->kq_state |= KQ_TASKSCHED;
 	}
 }
+#endif
 
 /*
  * Expand the kq to make sure we have storage for fops/ident pair.
@@ -2221,7 +2223,11 @@ kqueue_wakeup(struct kqueue *kq)
 			kq->kq_state &= ~KQ_SEL;
 	}
 	if (!knlist_empty(&kq->kq_sel.si_note))
+#ifndef FSTACK
 		kqueue_schedtask(kq);
+#else
+		KNOTE_UNLOCKED(&kq->kq_sel.si_note, 0);
+#endif
 	if ((kq->kq_state & KQ_ASYNC) == KQ_ASYNC) {
 		pgsigio(&kq->kq_sigio, SIGIO, 0);
 	}

Original file line number	Diff line number	Diff line change
`@@ -1672,6 +1672,7 @@ kqueue_release(struct kqueue *kq, int locked)`
`1672`	`1672`	`KQ_UNLOCK(kq);`
`1673`	`1673`	`}`
`1674`	`1674`
	`1675`	`+#ifndef FSTACK`
`1675`	`1676`	`static void`
`1676`	`1677`	`kqueue_schedtask(struct kqueue *kq)`
`1677`	`1678`	`{`
`@@ -1685,6 +1686,7 @@ kqueue_schedtask(struct kqueue *kq)`
`1685`	`1686`	`kq->kq_state \|= KQ_TASKSCHED;`
`1686`	`1687`	`}`
`1687`	`1688`	`}`
	`1689`	`+#endif`
`1688`	`1690`
`1689`	`1691`	`/*`
`1690`	`1692`	`* Expand the kq to make sure we have storage for fops/ident pair.`
`@@ -2221,7 +2223,11 @@ kqueue_wakeup(struct kqueue *kq)`
`2221`	`2223`	`kq->kq_state &= ~KQ_SEL;`
`2222`	`2224`	`}`
`2223`	`2225`	`if (!knlist_empty(&kq->kq_sel.si_note))`
	`2226`	`+#ifndef FSTACK`
`2224`	`2227`	`kqueue_schedtask(kq);`
	`2228`	`+#else`
	`2229`	`+ KNOTE_UNLOCKED(&kq->kq_sel.si_note, 0);`
	`2230`	`+#endif`
`2225`	`2231`	`if ((kq->kq_state & KQ_ASYNC) == KQ_ASYNC) {`
`2226`	`2232`	`pgsigio(&kq->kq_sigio, SIGIO, 0);`
`2227`	`2233`	`}`