diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-07-28 15:42:24 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2015-07-28 15:42:24 +0000 |
| commit | 4284e83059178a8e56f7dfb5b7fb38156d31204c (patch) | |
| tree | 01f9da0e47eb6c24cdffe6ffff433da979f1accc /sys/dev/softraid.c | |
| parent | 5f44a5b892a77985b69343b0e6d2f481d8d017e7 (diff) | |
Tweak a couple of [SLIST|TAILQ]_REMOVE() usages in loops to a more
obvious idiom.
ok bluhm@ jsing@
Diffstat (limited to 'sys/dev/softraid.c')
| -rw-r--r-- | sys/dev/softraid.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index 84978e8735f..c4517bcae6f 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.361 2015/07/27 04:11:58 halex Exp $ */ +/* $OpenBSD: softraid.c,v 1.362 2015/07/28 15:42:23 krw Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -1755,15 +1755,15 @@ sr_hotplug_unregister(struct sr_discipline *sd, void *func) DEVNAME(sd->sd_sc), sd->sd_meta->ssd_devname, func); /* make sure we are on the list yet */ - SLIST_FOREACH(mhe, &sr_hotplug_callbacks, shl_link) - if (mhe->sh_hotplug == func) { - SLIST_REMOVE(&sr_hotplug_callbacks, mhe, - sr_hotplug_list, shl_link); - free(mhe, M_DEVBUF, 0); - if (SLIST_EMPTY(&sr_hotplug_callbacks)) - SLIST_INIT(&sr_hotplug_callbacks); - return; - } + SLIST_FOREACH(mhe, &sr_hotplug_callbacks, shl_link) { + if (mhe->sh_hotplug == func) + break; + } + if (mhe != NULL) { + SLIST_REMOVE(&sr_hotplug_callbacks, mhe, + sr_hotplug_list, shl_link); + free(mhe, M_DEVBUF, 0); + } } void @@ -3848,7 +3848,7 @@ void sr_discipline_free(struct sr_discipline *sd) { struct sr_softc *sc; - struct sr_discipline *sdtmp1, *sdtmp2; + struct sr_discipline *sdtmp1; struct sr_meta_opt_head *som; struct sr_meta_opt_item *omi, *omi_next; @@ -3882,12 +3882,12 @@ sr_discipline_free(struct sr_discipline *sd) sc->sc_targets[sd->sd_target] = NULL; } - TAILQ_FOREACH_SAFE(sdtmp1, &sc->sc_dis_list, sd_link, sdtmp2) { - if (sdtmp1 == sd) { - TAILQ_REMOVE(&sc->sc_dis_list, sd, sd_link); + TAILQ_FOREACH(sdtmp1, &sc->sc_dis_list, sd_link) { + if (sdtmp1 == sd) break; - } } + if (sdtmp1 != NULL) + TAILQ_REMOVE(&sc->sc_dis_list, sd, sd_link); explicit_bzero(sd, sizeof *sd); free(sd, M_DEVBUF, 0); |