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