diff options
| author | Dmitry Chagin <dchagin@FreeBSD.org> | 2021-04-02 08:43:17 +0000 |
|---|---|---|
| committer | Dmitry Chagin <dchagin@FreeBSD.org> | 2021-04-16 08:36:12 +0000 |
| commit | a83c64a59cf5dd4c8eb86ce9dbdcf84c2c874fb8 (patch) | |
| tree | 923159c2f752e86ad9f3249890b2e3899dc920f5 | |
| parent | c91586dcfc9ed2cb94b672b6ac0a21aaace2dff1 (diff) | |
| download | src-a83c64a59cf5dd4c8eb86ce9dbdcf84c2c874fb8.tar.gz src-a83c64a59cf5dd4c8eb86ce9dbdcf84c2c874fb8.zip | |
Partially revert r248770.
Under geom(4) nvme_ns_bio_process() is on the path where sleep
is prohibited as g_io_shedule_down() calls THREAD_NO_SLEEPNG()
before geom->start().
Reviewed By: imp
Differential Revision: https://reviews.freebsd.org/D29539
(cherry picked from commit a78109d5db87b08785a822770e2e4fdb15f921b6)
| -rw-r--r-- | sys/dev/nvme/nvme_ns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index ef38c8dc7826..9452f6460973 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -473,7 +473,7 @@ nvme_ns_bio_process(struct nvme_namespace *ns, struct bio *bp, case BIO_DELETE: dsm_range = malloc(sizeof(struct nvme_dsm_range), M_NVME, - M_ZERO | M_WAITOK); + M_ZERO | M_NOWAIT); if (!dsm_range) { err = ENOMEM; break; |