diff options
| author | scottl <scottl@FreeBSD.org> | 2013-09-25 15:55:56 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2013-09-25 15:55:56 +0000 |
| commit | e2e8dc4dbba38724bc3ce5c338d23ab3c6bfada4 (patch) | |
| tree | 9a78df2c62172d1d88764bd09a66b3946c768f72 /sys/cam/cam_xpt.c | |
| parent | 43aa8edf2f0a0f0b75805747a784a6700d6903a4 (diff) | |
| download | FreeBSD-src-e2e8dc4dbba38724bc3ce5c338d23ab3c6bfada4.zip FreeBSD-src-e2e8dc4dbba38724bc3ce5c338d23ab3c6bfada4.tar.gz | |
Re-do r255853. Along with adding back the API/ABI changes from the
original, this hides the contents of cam_compat.h from ktrace/kdump/truss,
avoiding problems there. There are no user-servicable parts in there, so
no need for those tools to be groping around in there.
Approved by: re
Diffstat (limited to 'sys/cam/cam_xpt.c')
| -rw-r--r-- | sys/cam/cam_xpt.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index e50b0ad..2c187d3 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -397,9 +397,7 @@ xptioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td int error; if ((error = xptdoioctl(dev, cmd, addr, flag, td)) == ENOTTY) { - error = cam_compat_ioctl(dev, &cmd, &addr, &flag, td); - if (error == EAGAIN) - return (xptdoioctl(dev, cmd, addr, flag, td)); + error = cam_compat_ioctl(dev, cmd, addr, flag, td, xptdoioctl); } return (error); } @@ -4385,8 +4383,6 @@ xpt_get_ccb(struct cam_ed *device) if (new_ccb == NULL) { return (NULL); } - if ((sim->flags & CAM_SIM_MPSAFE) == 0) - callout_handle_init(&new_ccb->ccb_h.timeout_ch); SLIST_INSERT_HEAD(&sim->ccb_freeq, &new_ccb->ccb_h, xpt_links.sle); sim->ccb_count++; |
