diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-08-02 20:48:50 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-08-02 20:49:37 +0000 |
| commit | 70fe2b10487a1b0dfe11ed0378b4f835ff133884 (patch) | |
| tree | 1b1ba002da58e2de71400bd8cc8a418ac0d31fa9 /usr | |
| parent | b81db1e8f4fb4ce1e3bf7f8053643f62803cf4fe (diff) | |
| download | illumos-joyent-release-20170803.tar.gz | |
OS-6262 lx io_cancel should use cached iocb datarelease-20170803
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Approved by: Patrick Mooney <patrick.mooney@joyent.com>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/uts/common/brand/lx/syscall/lx_aio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/brand/lx/syscall/lx_aio.c b/usr/src/uts/common/brand/lx/syscall/lx_aio.c index b7c52a1308..0980a961c4 100644 --- a/usr/src/uts/common/brand/lx/syscall/lx_aio.c +++ b/usr/src/uts/common/brand/lx/syscall/lx_aio.c @@ -221,7 +221,7 @@ typedef struct lx_io_elem { int64_t lxioelem_offset; /* offset in file */ uint64_t lxioelem_data; ssize_t lxioelem_res; - lx_iocb_t *lxioelem_cbp; + void *lxioelem_cbp; /* ptr to iocb in userspace */ } lx_io_elem_t; /* From lx_rw.c */ @@ -1240,7 +1240,7 @@ lx_io_cancel(lx_aio_context_t cid, lx_iocb_t *iocbp, lx_io_event_t *result) ep->lxioelem_resfp = NULL; } - ev.lxioe_data = ep->lxioelem_cbp->lxiocb_data; + ev.lxioe_data = ep->lxioelem_data; ev.lxioe_object = (uint64_t)(uintptr_t)ep->lxioelem_cbp; ev.lxioe_res = 0; ev.lxioe_res2 = 0; |