From nobody Sun May 1 02:54:33 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 4FCD0199B78E; Sun, 1 May 2022 02:54:33 +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 4KrW611mz0z3kGv; Sun, 1 May 2022 02:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651373673; 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=fyQivZBFcHZoCBg9RnfCWZNOJKowXccAi/njbyVTxxQ=; b=YVJcHy+j1YhRT3ekcEnvPd1XYh0PQyzCaVmX8Ll0YW+Z9ExgAJoZDCa4YwztfWL1RDiG50 HBGlMHtmZjabuTYtlK6Iy2jnqtMFIxXmiG/daZbNaP/h3VcmSeomYAMk0+VRTD75rvBFYp uKQNOgM1xo/QFJFCpOtztEZSAODeDclETwEjyCellFjqTxlM8Y1mKY41EKKFWNn70k4zy+ yJ9e+wAaqy+Scm4d2PHelC5iebR0ya0hGErD1aCeELLsLv7AoO6Vnw3grHp/l8uQn11mg+ Am0cnS6/Vc20EFhDNuxw6ZzgiC+IO2Nwfv8lugNopWoBdMQcy73s3T2w/iSWzw== 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 1CE1653E5; Sun, 1 May 2022 02:54:33 +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 2412sXE7088799; Sun, 1 May 2022 02:54:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2412sXB5088798; Sun, 1 May 2022 02:54:33 GMT (envelope-from git) Date: Sun, 1 May 2022 02:54:33 GMT Message-Id: <202205010254.2412sXB5088798@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: 3529ddcfbe09 - stable/13 - CAM: Replicate e0ceec676dc8 from da to ada and nda. 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: 3529ddcfbe09c6f00e8d09600b08b1a7f5b3a011 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651373673; 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=fyQivZBFcHZoCBg9RnfCWZNOJKowXccAi/njbyVTxxQ=; b=sM0AIgG3bPycmvWfCO4eHC2qgF0IN7cqt9jUdVcoAMRhwWYx5jtM3WiNcC7S5ibOz2fwxm vMRkN8gcc1AvfbzIsm091innMqzryX/wqMp9xLIa8h5NgUg+03kaWqjJXw18vSpNP1DUS3 l8JQiPujyiMso4Jwo8LHzpchDav91k9TuBSeUDLstMeM9YfcN97TclL0fkciye4nO+LPwW mw5fkteYJsw36U4Dm+P+2Gfrl4tDHcHhp3SGs6Qp6XDMZ2TYfAuz5Fpxll4v26a9/n9+Kv XVOS1mdZB9JEJNKdS15OVC7aUEvH+RuuE1k5M1GFkochjX2J7MovmfAZErd00Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651373673; a=rsa-sha256; cv=none; b=uQuigP7HNAXD6cS41Q8JfGI/1G93/X9tTHW1HRM019hrNlrG9yk1g53PS/T/BVEAcJE7+f kek4LbRdLZG8kWKfMPBEi3z14ekDruhiwlkwjgApFBT8zTSPCP2yfH37eKRaw3LODI/KGj opUHw4YwXge1i2/ZHdObxl7FMdS0PwaBnSaslF8IgZR7YVwfittXIywr6IMtyfDX9bv5fh EJbsuj8+ALjgAK1qaRa21s5xEKYyJC3zL7XryqirD/KdiLav8Yt6o5nlqQgCsaXVENMuIJ B0vbCVp1BFvSLyHasuUdP1AdtgHbRmX3mDV+vMZZNZmQ4F4697DFPFfHPWH0Pw== 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=3529ddcfbe09c6f00e8d09600b08b1a7f5b3a011 commit 3529ddcfbe09c6f00e8d09600b08b1a7f5b3a011 Author: Alexander Motin AuthorDate: 2022-04-24 00:14:10 +0000 Commit: Alexander Motin CommitDate: 2022-05-01 02:54:29 +0000 CAM: Replicate e0ceec676dc8 from da to ada and nda. MFC after: 1 week (cherry picked from commit 38f8addaab1aac0830948189826bd7c7931859fd) --- 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 a101c5b5a527..abcc63b8df5f 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -3668,6 +3668,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(); }