The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=59e2f48e038b727b6a59c21734304878b60c1578
commit 59e2f48e038b727b6a59c21734304878b60c1578 Author: Warner Losh <[email protected]> AuthorDate: 2021-11-16 03:35:58 +0000 Commit: Alexander Motin <[email protected]> CommitDate: 2022-01-06 19:08:24 +0000 mpr: Minor formatting changes to match mps. Minor reformatting nits to make mprsas_scsiio_timeout match mpssas_scsiio_timeout more closely. The differences aren't necessary and are distracting when comparing the routines. No functional changes. Sponsored by: Netflix (cherry picked from commit 2bbaed4d7fcace17c619536f4119b89058ed4392) --- sys/dev/mpr/mpr_sas.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/mpr/mpr_sas.c b/sys/dev/mpr/mpr_sas.c index 3a0bf5aca702..f0e05f9c886f 100644 --- a/sys/dev/mpr/mpr_sas.c +++ b/sys/dev/mpr/mpr_sas.c @@ -1678,19 +1678,19 @@ mprsas_scsiio_timeout(void *data) /* target already in recovery, just queue up another * timedout command to be processed later. */ - mpr_dprint(sc, MPR_RECOVERY, "queued timedout cm %p for " - "processing by tm %p\n", cm, targ->tm); - } - else if ((targ->tm = mprsas_alloc_tm(sc)) != NULL) { - /* start recovery by aborting the first timedout command */ + mpr_dprint(sc, MPR_RECOVERY, + "queued timedout cm %p for processing by tm %p\n", + cm, targ->tm); + } else if ((targ->tm = mprsas_alloc_tm(sc)) != NULL) { mpr_dprint(sc, MPR_RECOVERY|MPR_INFO, "Sending abort to target %u for SMID %d\n", targ->tid, cm->cm_desc.Default.SMID); mpr_dprint(sc, MPR_RECOVERY, "timedout cm %p allocated tm %p\n", cm, targ->tm); + + /* start recovery by aborting the first timedout command */ mprsas_send_abort(sc, targ->tm, cm); - } - else { + } else { /* XXX queue this target up for recovery once a TM becomes * available. The firmware only has a limited number of * HighPriority credits for the high priority requests used
