On 23.03.2018 07:01, Michael van Elst wrote:
> Module Name: src
> Committed By: mlelstv
> Date: Fri Mar 23 06:01:07 UTC 2018
>
> Modified Files:
> src/sys/dev/scsipi: st.c
>
> Log Message:
> Use separate lock to protect internal state and release locks when
> calling biodone.
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.231 -r1.232 src/sys/dev/scsipi/st.c
>
I had to revert this in order to unbreak build.
/usr/src/sys/dev/scsipi/st.c: In function 'stattach':
/usr/src/sys/dev/scsipi/st.c:398:16: error: 'struct st_softc' has no
member named 'buf_defer'; did you mean 'buf_queue'?
bufq_alloc(&st->buf_defer, "fcfs", 0);
^~
/usr/src/sys/dev/scsipi/st.c:400:16: error: 'struct st_softc' has no
member named 'sc_iolock'; did you mean 'sc_callout'?
mutex_init(&st->sc_iolock, MUTEX_DEFAULT, IPL_VM);
^~
/usr/src/sys/dev/scsipi/st.c: In function 'stdetach':
/usr/src/sys/dev/scsipi/st.c:451:15: error: 'struct st_softc' has no
member named 'buf_defer'; did you mean 'buf_queue'?
bufq_drain(st->buf_defer);
^~
/usr/src/sys/dev/scsipi/st.c:459:14: error: 'struct st_softc' has no
member named 'buf_defer'; did you mean 'buf_queue'?
bufq_free(st->buf_defer);
^~
/usr/src/sys/dev/scsipi/st.c:461:19: error: 'struct st_softc' has no
member named 'sc_iolock'; did you mean 'sc_callout'?
mutex_destroy(&st->sc_iolock);
^~
/usr/src/sys/dev/scsipi/st.c: In function 'ststart':
/usr/src/sys/dev/scsipi/st.c:1270:17: error: 'struct st_softc' has no
member named 'sc_iolock'; did you mean 'sc_callout'?
mutex_enter(&st->sc_iolock);
^~
/usr/src/sys/dev/scsipi/st.c:1272:26: error: 'struct st_softc' has no
member named 'buf_defer'; did you mean 'buf_queue'?
while ((bp = bufq_get(st->buf_defer)) != NULL
^~
/usr/src/sys/dev/scsipi/st.c:1276:17: error: 'struct st_softc' has no
member named 'sc_iolock'; did you mean 'sc_callout'?
mutex_exit(&st->sc_iolock);
^~
/usr/src/sys/dev/scsipi/st.c:1280:18: error: 'struct st_softc' has no
member named 'sc_iolock'; did you mean 'sc_callout'?
mutex_enter(&st->sc_iolock);
^~
/usr/src/sys/dev/scsipi/st.c:1285:15: error: 'struct st_softc' has no
member named 'buf_defer'; did you mean 'buf_queue'?
bufq_put(st->buf_defer, bp);
^~
/usr/src/sys/dev/scsipi/st.c:1288:17: error: 'struct st_softc' has no
member named 'sc_iolock'; did you mean 'sc_callout'?
mutex_exit(&st->sc_iolock);
^~
/usr/src/sys/dev/scsipi/st.c:1296:18: error: 'struct st_softc' has no
member named 'sc_iolock'; did you mean 'sc_callout'?
mutex_enter(&st->sc_iolock);
^~
/usr/src/sys/dev/scsipi/st.c:1299:16: error: 'struct st_softc' has no
member named 'sc_iolock'; did you mean 'sc_callout'?
mutex_exit(&st->sc_iolock);
^~
/usr/src/sys/dev/scsipi/st.c: In function 'stdone':
/usr/src/sys/dev/scsipi/st.c:1331:18: error: 'struct st_softc' has no
member named 'sc_iolock'; did you mean 'sc_callout'?
mutex_enter(&st->sc_iolock);
^~
/usr/src/sys/dev/scsipi/st.c:1353:17: error: 'struct st_softc' has no
member named 'sc_iolock'; did you mean 'sc_callout'?
mutex_exit(&st->sc_iolock);
^~
--- st.o ---
*** [st.o] Error code 1
nbmake: stopped in /public/netbsd-root/sys/arch/amd64/compile/GENERIC
1 error
nbmake: stopped in /public/netbsd-root/sys/arch/amd64/compile/GENERIC
ERROR: Failed to make all in
"/public/netbsd-root/sys/arch/amd64/compile/GENERIC"
Attachment:
signature.asc
Description: OpenPGP digital signature