diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2017-02-28 11:56:17 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2017-02-28 11:56:17 +0000 |
| commit | 3a13860a1b87b7d27110826f86c4264e0e7b4d43 (patch) | |
| tree | eaffb7776704ca3d79fd989edbf77827cdfe58bd /sys/cam/ctl | |
| parent | 511d4e58f360d7c5254e4a49b30e9888add62579 (diff) | |
| download | src-3a13860a1b87b7d27110826f86c4264e0e7b4d43.tar.gz src-3a13860a1b87b7d27110826f86c4264e0e7b4d43.zip | |
Make ctl_queue_sense() not sleep.
It may be called in non-sleepable frontend context.
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=314387
Diffstat (limited to 'sys/cam/ctl')
| -rw-r--r-- | sys/cam/ctl/ctl.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 1539cbeb4604..becdd6fbddff 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -13146,21 +13146,15 @@ ctl_queue_sense(union ctl_io *io) initidx = ctl_get_initindex(&io->io_hdr.nexus); p = initidx / CTL_MAX_INIT_PER_PORT; - if ((ps = lun->pending_sense[p]) == NULL) { - mtx_unlock(&lun->lun_lock); - ps = malloc(sizeof(*ps) * CTL_MAX_INIT_PER_PORT, M_CTL, - M_WAITOK | M_ZERO); - mtx_lock(&lun->lun_lock); - if (lun->pending_sense[p] == NULL) { - lun->pending_sense[p] = ps; - } else { - free(ps, M_CTL); - ps = lun->pending_sense[p]; - } + if (lun->pending_sense[p] == NULL) { + lun->pending_sense[p] = malloc(sizeof(*ps) * CTL_MAX_INIT_PER_PORT, + M_CTL, M_NOWAIT | M_ZERO); + } + if ((ps = lun->pending_sense[p]) != NULL) { + ps += initidx % CTL_MAX_INIT_PER_PORT; + memset(ps, 0, sizeof(*ps)); + memcpy(ps, &io->scsiio.sense_data, io->scsiio.sense_len); } - ps += initidx % CTL_MAX_INIT_PER_PORT; - memset(ps, 0, sizeof(*ps)); - memcpy(ps, &io->scsiio.sense_data, io->scsiio.sense_len); mtx_unlock(&lun->lun_lock); bailout: |