diff options
| author | emaste <emaste@FreeBSD.org> | 2011-02-03 02:14:53 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2011-02-03 02:14:53 +0000 |
| commit | dc94d2f8147d94a16fa765ded5f70a96fdca151e (patch) | |
| tree | 712711cfa0c8a5dd26b7f4474046905ab7c82c91 /sys/dev/aac | |
| parent | c70bfd860abd2c13454389a9370dd05336d57790 (diff) | |
| download | FreeBSD-src-dc94d2f8147d94a16fa765ded5f70a96fdca151e.zip FreeBSD-src-dc94d2f8147d94a16fa765ded5f70a96fdca151e.tar.gz | |
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
Diffstat (limited to 'sys/dev/aac')
| -rw-r--r-- | sys/dev/aac/aac.c | 6 |
1 files changed, 1 insertions, 5 deletions
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); } |
