git: 38f8addaab1a - main - CAM: Replicate e0ceec676dc8 from da to ada and nda.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 24 Apr 2022 00:15:28 UTC
The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=38f8addaab1aac0830948189826bd7c7931859fd commit 38f8addaab1aac0830948189826bd7c7931859fd Author: Alexander Motin <mav@FreeBSD.org> AuthorDate: 2022-04-24 00:14:10 +0000 Commit: Alexander Motin <mav@FreeBSD.org> 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(); }