diff options
| author | Renato Botelho <renato@netgate.com> | 2017-02-23 06:28:41 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-02-23 06:28:41 -0300 |
| commit | 82ceeb2ea625cd9bff60f2863b9a0830f55b7905 (patch) | |
| tree | 263ca9347bf664a4489743f9302e699ce14de1df /sys/cam | |
| parent | 4a05f5440acda223e6a0ec5157bc32ecc0f09ff9 (diff) | |
| parent | d20dd8b36e7a565be7bfbb22aade51c8ffd753e9 (diff) | |
| download | FreeBSD-src-devel.zip FreeBSD-src-devel.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into develdevel
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/ctl/ctl.c | 3 | ||||
| -rw-r--r-- | sys/cam/ctl/ctl_backend_ramdisk.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 1b3a57f..a7ac7f9 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -12393,6 +12393,9 @@ ctl_datamove(union ctl_io *io) if (io->io_hdr.flags & CTL_FLAG_DELAY_DONE) { io->io_hdr.flags &= ~CTL_FLAG_DELAY_DONE; } else { + struct ctl_lun *lun; + + lun = CTL_LUN(io); if ((lun != NULL) && (lun->delay_info.datamove_delay > 0)) { diff --git a/sys/cam/ctl/ctl_backend_ramdisk.c b/sys/cam/ctl/ctl_backend_ramdisk.c index b743bc6..ba3fa1c 100644 --- a/sys/cam/ctl/ctl_backend_ramdisk.c +++ b/sys/cam/ctl/ctl_backend_ramdisk.c @@ -1120,8 +1120,10 @@ ctl_backend_ramdisk_create(struct ctl_be_ramdisk_softc *softc, STAILQ_INIT(&be_lun->cont_queue); sx_init(&be_lun->page_lock, "cram page lock"); - if (be_lun->cap_bytes == 0) + if (be_lun->cap_bytes == 0) { + be_lun->indir = 0; be_lun->pages = malloc(be_lun->pblocksize, M_RAMDISK, M_WAITOK); + } be_lun->zero_page = malloc(be_lun->pblocksize, M_RAMDISK, M_WAITOK|M_ZERO); mtx_init(&be_lun->queue_lock, "cram queue lock", NULL, MTX_DEF); |
