From nobody Tue Apr 26 17:01:36 2022 X-Original-To: dev-commits-src-all@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 C2E3C1AAA57E; Tue, 26 Apr 2022 17:01: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 4Knp7h57GYz4qfB; Tue, 26 Apr 2022 17:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650992496; 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=sQ3cPwXew5Oz9aidC0eDqvvNqVz0VHqg9C57dQIO3Ig=; b=k3KI01OG+z4zKrM5YaEYMu88jS1P71avPuzdmC9p7PGtf63qR9kJmGk2Mgxo9nsJMEHXox 73bPApBL9MHNSdQeb9ma0j5/0oJZ/UwCWbK5NNkS9rWKwff4sIMVCR2JYq3A9LnjXe6prC 1pz7mzvPC++QJIEOn31wf4ZSHSM3RD4hYaiPqxRQ7PSdEK/oH75TzhVprgY0TtCLX5W+Th JihoQ8Ef4HtXf7/RRWclSqzDVvnyKHgVgQ9vBfz4eF90GeT2nWk2Y4L1pF6QAhTNwZ/GLU /MLrg4PditDnuAsm5znKI5aE41xIouRPpkbMy7E9IBTU+ex6MGx7wpxEnZOGkQ== 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 90E151360C; Tue, 26 Apr 2022 17:01:36 +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 23QH1axC001566; Tue, 26 Apr 2022 17:01:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QH1a28001565; Tue, 26 Apr 2022 17:01:36 GMT (envelope-from git) Date: Tue, 26 Apr 2022 17:01:36 GMT Message-Id: <202204261701.23QH1a28001565@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ae1955cd67c2 - main - adaasync: Harmonize with daasync List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae1955cd67c293dd402d9d007b368ef88c6eb1d9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650992496; 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=sQ3cPwXew5Oz9aidC0eDqvvNqVz0VHqg9C57dQIO3Ig=; b=oeLxdhvhCA89IrZjYznCsKvmUiYxMDAYvNSQrP0zND7dJG8LyBoCWZBN5CgsizxlgWrkli LyMoHQEVksZmqW6U/UZ+Y7UhP1+DQ3Tmqx0DK6U8dJR2yWOrqrpaTOd0tTQieImSbYXjmH Q3UbtN3Ofp+be0MiscvJbbcAYKtXB2Esh+vFYMFwyuW/I6W+QqcuzNfxGhBSIqMex22n8Z akhBv8AQdeidVXVFekGYEFPnG4Vgl+tiRbdTOyrOkucLzlRvioEO1iws1C2BrOms03SWMM VSTIdpqvFFHGSE6MGiZgecadW9sG+x/aMMyFll3tt7yGS7w1h/r6n9e3DntjTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650992496; a=rsa-sha256; cv=none; b=u7GCNPFRDb5BSCpG1qKmBGdSL+n8l9XjB88O5wZmn8SJTqUVt6zDwLYjc6SwN03FHmxjie wMb81Ray9vFKYGcdKmLyJeWJ0P01RnLS7i1Q3uxHkVyAl2ECb6yvxbIZ2JM7N0xEXLdksQ fIn5hvg54DK1CdgmuEicskNPwzCCic0dfGFZxzcq86N+wx6fdX8OT2gW3yK5CgDkz70keb bM0uHgCMycqF6L6d1mX3CL9wISaXbkaY8kEx7r3n0KmcTNXhRtueneLn0IJtGfLuAgY1ln 85FdmfO5pNU0SrUyx2RIiR1l+rorXHFYCzJUcxtJS0CY/vO/N0Udn3mkSKMX1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ae1955cd67c293dd402d9d007b368ef88c6eb1d9 commit ae1955cd67c293dd402d9d007b368ef88c6eb1d9 Author: Warner Losh AuthorDate: 2022-04-26 17:01:06 +0000 Commit: Warner Losh CommitDate: 2022-04-26 17:01:39 +0000 adaasync: Harmonize with daasync We should call cam_periph_async() always, like SCSI does. This routine is supposed to be more of a catch-all. cam_periph_async() only does actions for AC_LOST_DEVICE. It ignores all other events (today), but this may not always be true. So this is a nop change. Drop in a 'break' so we don't fall through unnecessarily. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D35057 --- sys/cam/ata/ata_da.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index a83c5a50c5f3..b82671315138 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -1352,8 +1352,6 @@ adaasync(void *callback_arg, u_int32_t code, adasetflags(softc, &cgd); adasetgeom(softc, &cgd); disk_resize(softc->disk, M_NOWAIT); - - cam_periph_async(periph, code, path, arg); break; } case AC_ADVINFO_CHANGED: @@ -1374,7 +1372,6 @@ adaasync(void *callback_arg, u_int32_t code, case AC_BUS_RESET: { softc = (struct ada_softc *)periph->softc; - cam_periph_async(periph, code, path, arg); if (softc->state != ADA_STATE_NORMAL) break; if (ADA_RA >= 0 && softc->flags & ADA_FLAG_CAN_RAHEAD) @@ -1385,16 +1382,17 @@ adaasync(void *callback_arg, u_int32_t code, && (softc->zone_mode != ADA_ZONE_NONE)) softc->state = ADA_STATE_LOGDIR; else - break; + break; if (cam_periph_acquire(periph) != 0) softc->state = ADA_STATE_NORMAL; else xpt_schedule(periph, CAM_PRIORITY_DEV); + break; } default: - cam_periph_async(periph, code, path, arg); break; } + cam_periph_async(periph, code, path, arg); } static int