From nobody Sun Apr 24 00:15:28 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 87A101999CD1; Sun, 24 Apr 2022 00:15:28 +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 4Km7vh3PV0z3jfB; Sun, 24 Apr 2022 00:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650759328; 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=Gx+d3NLo5FYXrYOeR2Crag+tPcCcSCkBRsVSc+FkEqE=; b=Cpgo74oVodPxttHUHWHFErF7vd8Rmvb5Fp12CZcjFtn9KpPS8lquWqIqoKdYvWc3osrlpw ezgxmZZAOB1esKfgpBrh08C8PVz+Qmxv5we0pM7aFysL4NNs600PGMgADXpEsQKj0e97TD V5EqWqNcKNxlscmvsA4D6Vx/HxlFX5YxG/6n6ld6Mn90Y6/mBLrtvhhpAEr4O1tJYFGB1b P+EBcdretg+ZeLGGyj3W/jRJDLJbD3My/cWGYf1NtYr3n3gGCqRf7yDm+ghbxxnbYoUGEy s/BUnzPEt+Q3WjP9zCNYGfay6w9gWU+9lW7B1UR5Lo1qjXXQAxs62MSwl76XpA== 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 547081BDA6; Sun, 24 Apr 2022 00:15:28 +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 23O0FSmY044240; Sun, 24 Apr 2022 00:15:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23O0FSO9044239; Sun, 24 Apr 2022 00:15:28 GMT (envelope-from git) Date: Sun, 24 Apr 2022 00:15:28 GMT Message-Id: <202204240015.23O0FSO9044239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 38f8addaab1a - main - CAM: Replicate e0ceec676dc8 from da to ada and nda. 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38f8addaab1aac0830948189826bd7c7931859fd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650759328; 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=Gx+d3NLo5FYXrYOeR2Crag+tPcCcSCkBRsVSc+FkEqE=; b=B6UCKW5K7iWFCWCKptkjazL6v4ehGfoD0C1uBKKhiG83aRV6COoaBt3lIn06GQKjm8kNDQ Y/wjB6bW8zaJxnexSSUk4gwMmuw1SeSk3Zr4CIYEFOBdmddpZkfDAT6+FcpuTtehbKxbMI vY30Ikb+cnYyukRcQ8JE1utxejbovtrv9S2sZghi0rn3XrG+om/6FzNpluwonR/bkfE4AT 2SWu+hN6v3KBZN86pBVCJo2BvkcfhFs55KXnQVYRnHjO1yfvzFiRVJ6onQtr1ql2BEtcag 0NheR7eE/PRDWS0kBQJPeJL2ww6OF6Wy9/Tvi/bkekHT/m2apL1oq2/V24kgwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650759328; a=rsa-sha256; cv=none; b=wZMN3u6zZjGESkhQ2AOye+j7g3v4oUg2Zd0SZCs2Lorgt2NnQlbwsaHfJKhIDGNRBgf7no 8GZpMLPU5MDoNiy0XZRvtSttXe77GvAEZ/gL+eaDD/CE8bbLPfjW+gEv1pKeRZjcHbXDEZ mNEn/RVxgtzCo2T5d+vXDbsiTubGu5ZZ5zY8hEX9XjCxCVwnaE8GM6gU6/VvYzNm4WDMxT uNNNhkOqeLfc1j4ojFUr32AW+P1X4/aXG7TBhOFb3qtwSYL4k0Dk4vNa72l46dy+fg2uq4 gxtPaDYVYqS8RhZ1DM9hbg61fjMXOGWuYU/Wwz5ZjpRoHtQiaqTcsZ5Vauf3BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=38f8addaab1aac0830948189826bd7c7931859fd commit 38f8addaab1aac0830948189826bd7c7931859fd Author: Alexander Motin AuthorDate: 2022-04-24 00:14:10 +0000 Commit: Alexander Motin CommitDate: 2022-04-24 00:15:17 +0000 CAM: Replicate e0ceec676dc8 from da to ada and nda. MFC after: 1 week --- sys/cam/ata/ata_da.c | 3 +++ sys/cam/nvme/nvme_da.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index d9d0c73c2dbb..9a57c3f3affa 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -3704,6 +3704,9 @@ adashutdown(void *arg, int howto) { int how; + if ((howto & RB_NOSYNC) != 0) + return; + adaflush(); /* diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index c7dc671170cc..84270143cbe6 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -1354,6 +1354,9 @@ static void ndashutdown(void *arg, int howto) { + if ((howto & RB_NOSYNC) != 0) + return; + ndaflush(); }