From dc94d2f8147d94a16fa765ded5f70a96fdca151e Mon Sep 17 00:00:00 2001 From: emaste Date: Thu, 3 Feb 2011 02:14:53 +0000 Subject: Revert part of r173264. Both aac_ioctl_sendfib and aac_ioctl_send_raw_srb make use of the aac_ioctl_event callback, if aac_alloc_command fails. This can end up in an infinite loop in the while loop in aac_release_command. Further investigation into the issue mentioned by Scott Long [1] will be necessary. [1] http://lists.freebsd.org/pipermail/freebsd-current/2007-October/078740.html --- sys/dev/aac/aac.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'sys/dev/aac') diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c index e3f47ed..53528fd 100644 --- a/sys/dev/aac/aac.c +++ b/sys/dev/aac/aac.c @@ -1415,11 +1415,7 @@ aac_release_command(struct aac_command *cm) aac_enqueue_free(cm); - /* - * Dequeue all events so that there's no risk of events getting - * stranded. - */ - while ((event = TAILQ_FIRST(&sc->aac_ev_cmfree)) != NULL) { + if ((event = TAILQ_FIRST(&sc->aac_ev_cmfree)) != NULL) { TAILQ_REMOVE(&sc->aac_ev_cmfree, event, ev_links); event->ev_callback(sc, event, event->ev_arg); } -- cgit v1.1