diff options
| author | jimharris <jimharris@FreeBSD.org> | 2013-03-26 22:11:34 +0000 |
|---|---|---|
| committer | jimharris <jimharris@FreeBSD.org> | 2013-03-26 22:11:34 +0000 |
| commit | 61a3cd77ccaa7474a0fa5821a55ad89fa7cea58d (patch) | |
| tree | b9721fc6e3a456241e04ecb5e27e06db526ce8fe /sys/dev/nvd | |
| parent | 5242be57d3d5eddc6859707cd02c511befa48366 (diff) | |
| download | FreeBSD-src-61a3cd77ccaa7474a0fa5821a55ad89fa7cea58d.zip FreeBSD-src-61a3cd77ccaa7474a0fa5821a55ad89fa7cea58d.tar.gz | |
Change a number of malloc(9) calls to use M_WAITOK instead of
M_NOWAIT.
Sponsored by: Intel
Suggested by: carl
Reviewed by: carl
Diffstat (limited to 'sys/dev/nvd')
| -rw-r--r-- | sys/dev/nvd/nvd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c index 09886b4..60f769d 100644 --- a/sys/dev/nvd/nvd.c +++ b/sys/dev/nvd/nvd.c @@ -260,7 +260,7 @@ nvd_new_controller(struct nvme_controller *ctrlr) struct nvd_controller *nvd_ctrlr; nvd_ctrlr = malloc(sizeof(struct nvd_controller), M_NVD, - M_ZERO | M_NOWAIT); + M_ZERO | M_WAITOK); TAILQ_INIT(&nvd_ctrlr->disk_head); TAILQ_INSERT_TAIL(&ctrlr_head, nvd_ctrlr, tailq); @@ -275,7 +275,7 @@ nvd_new_disk(struct nvme_namespace *ns, void *ctrlr_arg) struct disk *disk; struct nvd_controller *ctrlr = ctrlr_arg; - ndisk = malloc(sizeof(struct nvd_disk), M_NVD, M_ZERO | M_NOWAIT); + ndisk = malloc(sizeof(struct nvd_disk), M_NVD, M_ZERO | M_WAITOK); disk = disk_alloc(); disk->d_strategy = nvd_strategy; |
