Use proper STAILQ_* macros where possible.

diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 56cd467e77657a80004619137dad3351b0943301..1cbf8209b68aa9ef68365fc560a0ca0a95ebcc6d 100644 (file)
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -1922,13 +1922,8 @@ ctl_shutdown(void)
 
        mtx_lock(&softc->ctl_lock);
 
-       /*
-        * Free up each LUN.
-        */
-       for (lun = STAILQ_FIRST(&softc->lun_list); lun != NULL; lun = next_lun){
-               next_lun = STAILQ_NEXT(lun, links);
+       STAILQ_FOREACH_SAFE(lun, &softc->lun_list, links, next_lun)
                ctl_free_lun(lun);
-       }
 
        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,
                 * things can blow up.
                 */
-               for (i = 0, lun = STAILQ_FIRST(&softc->lun_list); lun != NULL;
-                    i++, lun = STAILQ_NEXT(lun, links)) {
-                       retval = copyout(&lun->stats, &stats->lun_stats[i],
+               i = 0;
+               STAILQ_FOREACH(lun, &softc->lun_list, links) {
+                       retval = copyout(&lun->stats, &stats->lun_stats[i++],
                                         sizeof(lun->stats));
                        if (retval != 0)
                                break;
@@ -4637,8 +4632,7 @@ ctl_enable_lun(struct ctl_be_lun *be_lun)
        lun->flags &= ~CTL_LUN_DISABLED;
        mtx_unlock(&lun->lun_lock);
 
-       for (port = STAILQ_FIRST(&softc->port_list); port != NULL; port = nport) {
-               nport = STAILQ_NEXT(port, links);
+       STAILQ_FOREACH_SAFE(port, &softc->port_list, links, nport) {
                if ((port->status & CTL_PORT_STATUS_ONLINE) == 0 ||
                    port->lun_map != NULL || port->lun_enable == NULL)
                        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
         * 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.flags & CTL_FLAG_STATUS_SENT) == 0))
                ctl_inject_error(lun, io);

diff --git a/sys/cam/ctl/ctl_backend_ramdisk.c b/sys/cam/ctl/ctl_backend_ramdisk.c
index b15ae85d749f56bd639e5ea5948b199de45f12a2..d1704462d47eea08126afc21aad5d52fc60e8734 100644 (file)
--- a/sys/cam/ctl/ctl_backend_ramdisk.c
+++ b/sys/cam/ctl/ctl_backend_ramdisk.c
@@ -180,14 +180,7 @@ ctl_backend_ramdisk_shutdown(void)
 #endif
 
        mtx_lock(&softc->lock);
-       for (lun = STAILQ_FIRST(&softc->lun_list); lun != NULL; lun = 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);
-
+       STAILQ_FOREACH_SAFE(lun, &softc->lun_list, links, next_lun) {
                /*
                 * Drop our lock here.  Since ctl_invalidate_lun() can call
                 * back into us, this could potentially lead to a recursive