The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=2bbaed4d7fcace17c619536f4119b89058ed4392
commit 2bbaed4d7fcace17c619536f4119b89058ed4392
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2021-11-16 03:35:58 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2021-11-16 04:27:15 +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
---
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 9b69e0654ae4..aace724e16f2 100644
--- a/sys/dev/mpr/mpr_sas.c
+++ b/sys/dev/mpr/mpr_sas.c
@@ -1677,19 +1677,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
