aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2021-03-01 23:35:45 +0000
committerAlexander Motin <mav@FreeBSD.org>2021-03-15 02:46:11 +0000
commit748feb192e2a36a9479a9f363d0b621bae614597 (patch)
treeda0ff4904ad28573c61fdd863073da2aa96f488d
parent7b4859b4a26a1725f8e09bc6b8ae45007a8c43b4 (diff)
downloadsrc-748feb192e2a36a9479a9f363d0b621bae614597.tar.gz
src-748feb192e2a36a9479a9f363d0b621bae614597.zip
Optimize out few extra memory accesses.
MFC after: 1 week (cherry picked from commit a59e2982fe3e6339629cc77fe9d349d60e03a05e)
-rw-r--r--sys/cam/ctl/ctl_backend_block.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c
index abcd8d6e6fae..54026844f695 100644
--- a/sys/cam/ctl/ctl_backend_block.c
+++ b/sys/cam/ctl/ctl_backend_block.c
@@ -418,7 +418,6 @@ ctl_be_block_move_done(union ctl_io *io, bool samethr)
struct ctl_lba_len_flags *lbalen;
beio = (struct ctl_be_block_io *)PRIV(io)->ptr;
- be_lun = beio->lun;
DPRINTF("entered\n");
io->scsiio.kern_rel_offset += io->scsiio.kern_data_len;
@@ -428,7 +427,7 @@ ctl_be_block_move_done(union ctl_io *io, bool samethr)
*/
if ((io->io_hdr.flags & CTL_FLAG_ABORT) == 0 &&
(io->io_hdr.status & CTL_STATUS_MASK) == CTL_STATUS_NONE) {
- lbalen = ARGS(beio->io);
+ lbalen = ARGS(io);
if (lbalen->flags & CTL_LLF_READ) {
ctl_set_success(&io->scsiio);
} else if (lbalen->flags & CTL_LLF_COMPARE) {
@@ -456,6 +455,7 @@ ctl_be_block_move_done(union ctl_io *io, bool samethr)
* This move done routine is generally called in the SIM's
* interrupt context, and therefore we cannot block.
*/
+ be_lun = (struct ctl_be_block_lun *)CTL_BACKEND_LUN(io);
if (samethr) {
be_lun->dispatch(be_lun, beio);
} else {
@@ -1272,7 +1272,7 @@ ctl_be_block_cw_dispatch_ws(struct ctl_be_block_lun *be_lun,
DPRINTF("entered\n");
beio = (struct ctl_be_block_io *)PRIV(io)->ptr;
- lbalen = ARGS(beio->io);
+ lbalen = ARGS(io);
if (lbalen->flags & ~(SWS_LBDATA | SWS_UNMAP | SWS_ANCHOR | SWS_NDOB) ||
(lbalen->flags & (SWS_UNMAP | SWS_ANCHOR) && be_lun->unmap == NULL)) {