d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use proper STAILQ_* macros where possible.

Browse Source
This commit is contained in:
mav 2015-09-30 20:38:35 +00:00
parent e2fc30564e
commit 71ccc7181f
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/cam/ctl/ctl.c
View File

@ -1922,13 +1922,8 @@ ctl_shutdown(void)
mtx_lock(&softc->ctl_lock); mtx_lock(&softc->ctl_lock);
/* STAILQ_FOREACH_SAFE(lun, &softc->lun_list, links, next_lun)
* Free up each LUN.
*/
for (lun = STAILQ_FIRST(&softc->lun_list); lun != NULL; lun = next_lun){
next_lun = STAILQ_NEXT(lun, links);
ctl_free_lun(lun); ctl_free_lun(lun);
}
mtx_unlock(&softc->ctl_lock); mtx_unlock(&softc->ctl_lock);
@ -2780,9 +2775,9 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
* XXX KDM no locking here. If the LUN list changes, * XXX KDM no locking here. If the LUN list changes,
* things can blow up. * things can blow up.
*/ */
for (i = 0, lun = STAILQ_FIRST(&softc->lun_list); lun != NULL; i = 0;
i++, lun = STAILQ_NEXT(lun, links)) { STAILQ_FOREACH(lun, &softc->lun_list, links) {
retval = copyout(&lun->stats, &stats->lun_stats[i], retval = copyout(&lun->stats, &stats->lun_stats[i++],
sizeof(lun->stats)); sizeof(lun->stats));
if (retval != 0) if (retval != 0)
break; break;
@ -4637,8 +4632,7 @@ ctl_enable_lun(struct ctl_be_lun *be_lun)
lun->flags &= ~CTL_LUN_DISABLED; lun->flags &= ~CTL_LUN_DISABLED;
mtx_unlock(&lun->lun_lock); mtx_unlock(&lun->lun_lock);
for (port = STAILQ_FIRST(&softc->port_list); port != NULL; port = nport) { STAILQ_FOREACH_SAFE(port, &softc->port_list, links, nport) {
nport = STAILQ_NEXT(port, links);
if ((port->status & CTL_PORT_STATUS_ONLINE) == 0 || if ((port->status & CTL_PORT_STATUS_ONLINE) == 0 ||
port->lun_map != NULL || port->lun_enable == NULL) port->lun_map != NULL || port->lun_enable == NULL)
continue; continue;
@ -13130,7 +13124,7 @@ ctl_process_done(union ctl_io *io)
* Check to see if we have any errors to inject here. We only * Check to see if we have any errors to inject here. We only
* inject errors for commands that don't already have errors set. * inject errors for commands that don't already have errors set.
*/ */
if ((STAILQ_FIRST(&lun->error_list) != NULL) && if (!STAILQ_EMPTY(&lun->error_list) &&
((io->io_hdr.status & CTL_STATUS_MASK) == CTL_SUCCESS) && ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_SUCCESS) &&
((io->io_hdr.flags & CTL_FLAG_STATUS_SENT) == 0)) ((io->io_hdr.flags & CTL_FLAG_STATUS_SENT) == 0))
ctl_inject_error(lun, io); ctl_inject_error(lun, io);

9
sys/cam/ctl/ctl_backend_ramdisk.c
View File

@ -180,14 +180,7 @@ ctl_backend_ramdisk_shutdown(void)
#endif #endif
mtx_lock(&softc->lock); mtx_lock(&softc->lock);
for (lun = STAILQ_FIRST(&softc->lun_list); lun != NULL; lun = next_lun){ STAILQ_FOREACH_SAFE(lun, &softc->lun_list, links, next_lun) {
/*
* Grab the next LUN. The current LUN may get removed by
* ctl_invalidate_lun(), which will call our LUN shutdown
* routine, if there is no outstanding I/O for this LUN.
*/
next_lun = STAILQ_NEXT(lun, links);
/* /*
* Drop our lock here. Since ctl_invalidate_lun() can call * Drop our lock here. Since ctl_invalidate_lun() can call
* back into us, this could potentially lead to a recursive * back into us, this could potentially lead to a recursive