39c39
< __FBSDID("$FreeBSD: head/sys/cam/ctl/ctl_backend.c 268288 2014-07-05 14:32:42Z mav $");
---
> __FBSDID("$FreeBSD: head/sys/cam/ctl/ctl_backend.c 275942 2014-12-19 20:35:06Z mav $");
69c69
< struct ctl_softc *ctl_softc;
---
> struct ctl_softc *softc;
72c72
< ctl_softc = control_softc;
---
> softc = control_softc;
74c74
< mtx_lock(&ctl_softc->ctl_lock);
---
> mtx_lock(&softc->ctl_lock);
78c78
< STAILQ_FOREACH(be_tmp, &ctl_softc->be_list, links) {
---
> STAILQ_FOREACH(be_tmp, &softc->be_list, links) {
80c80
< mtx_unlock(&ctl_softc->ctl_lock);
---
> mtx_unlock(&softc->ctl_lock);
84c84
< mtx_unlock(&ctl_softc->ctl_lock);
---
> mtx_unlock(&softc->ctl_lock);
91c91
< mtx_lock(&ctl_softc->ctl_lock);
---
> mtx_lock(&softc->ctl_lock);
93c93
< STAILQ_INSERT_TAIL(&ctl_softc->be_list, be, links);
---
> STAILQ_INSERT_TAIL(&softc->be_list, be, links);
95c95
< ctl_softc->num_backends++;
---
> softc->num_backends++;
116c116
< mtx_unlock(&ctl_softc->ctl_lock);
---
> mtx_unlock(&softc->ctl_lock);
124c124
< struct ctl_softc *ctl_softc;
---
> struct ctl_softc *softc;
126c126
< ctl_softc = control_softc;
---
> softc = control_softc;
128c128
< mtx_lock(&ctl_softc->ctl_lock);
---
> mtx_lock(&softc->ctl_lock);
135c135
< mtx_unlock(&ctl_softc->ctl_lock);
---
> mtx_unlock(&softc->ctl_lock);
139c139
< STAILQ_REMOVE(&ctl_softc->be_list, be, ctl_backend_driver, links);
---
> STAILQ_REMOVE(&softc->be_list, be, ctl_backend_driver, links);
141c141
< ctl_softc->num_backends--;
---
> softc->num_backends--;
149c149
< mtx_unlock(&ctl_softc->ctl_lock);
---
> mtx_unlock(&softc->ctl_lock);
157c157
< struct ctl_softc *ctl_softc;
---
> struct ctl_softc *softc;
160c160
< ctl_softc = control_softc;
---
> softc = control_softc;
162c162
< mtx_lock(&ctl_softc->ctl_lock);
---
> mtx_lock(&softc->ctl_lock);
164c164
< STAILQ_FOREACH(be_tmp, &ctl_softc->be_list, links) {
---
> STAILQ_FOREACH(be_tmp, &softc->be_list, links) {
166c166
< mtx_unlock(&ctl_softc->ctl_lock);
---
> mtx_unlock(&softc->ctl_lock);
171c171
< mtx_unlock(&ctl_softc->ctl_lock);
---
> mtx_unlock(&softc->ctl_lock);