From nobody Thu Jan 06 19:10:35 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3722F1945D4B; Thu, 6 Jan 2022 19:10:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JVGCH6bG2z4mQb; Thu, 6 Jan 2022 19:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C205B25586; Thu, 6 Jan 2022 19:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 206JAZgl062942; Thu, 6 Jan 2022 19:10:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 206JAZ7a062941; Thu, 6 Jan 2022 19:10:35 GMT (envelope-from git) Date: Thu, 6 Jan 2022 19:10:35 GMT Message-Id: <202201061910.206JAZ7a062941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 59e2f48e038b - stable/13 - mpr: Minor formatting changes to match mps. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 59e2f48e038b727b6a59c21734304878b60c1578 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641496235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ns5PWBaL43bjOwXkekJbpWhiUihkddE2uT2eejD1pgU=; b=MQTfQt+60A6TdHH9ogkTYH9kPEl1tNIJFwEdhPbQrqhsKWiDigpe/8Iful8m/hHnYCZGmP nGpw+8NJ6foRYlso4R321mIGNyFweo72IauKr8cqwKU+bPHeo9R3PbwoJklJZlv2+cw9NU Q1V4ASlhVTjhtJnfkJAGG0/2LEF4aDxGs2mYdA9wglUhQ8PA3JwC+4OAMWsXf0ck7q0iSB McREUG8y+K6K5+BxeiGFB6BuGl+OiP8kaWl3KL8u5u+a7T6+uyCak3oCchBb2pwJLc1iqe AELDtH6tJ8bsdtqsxD04imHPTTLws7zY/pboX+xsV1cQCa9wgz5+j1KH6eNP6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641496235; a=rsa-sha256; cv=none; b=NhhIEmV6xH+tgUtklyGU9S52DVbDmu9TqU9nTqNbfAvFXVTdUq6GDX3joIkXysCFOwcGz+ +eIAloZ+PzPKP+AXRuj7HABy2npOe/X/kNp2GXmE0Hjsx9UxO7yQHodCvhN5Xd2YF/sY+X twt2gUotU3DmiRpOsIpl35B82M9B2YFlehxwWkWIdTRwSlMoucfZ7l1w4w2DlTbwU0A6AW GrGzIc/od7FkNNYuVv7QLFgp1Nzjtpa+zDFNzn9EJZa/gUJvmtplNNyrpxaPJyIuStAYCN 1lqH7eJNtSktUZYf+CDRQ+hCywf9r/dV+wh515M0TxbSIjDgY0TgGMwXU1yWiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=59e2f48e038b727b6a59c21734304878b60c1578 commit 59e2f48e038b727b6a59c21734304878b60c1578 Author: Warner Losh AuthorDate: 2021-11-16 03:35:58 +0000 Commit: Alexander Motin 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