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/scsi | |
| 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/scsi')
| -rw-r--r-- | sys/cam/scsi/scsi_pass.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c index 61f4f42..6ce9bb0 100644 --- a/sys/cam/scsi/scsi_pass.c +++ b/sys/cam/scsi/scsi_pass.c @@ -580,9 +580,7 @@ passioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *t int error; if ((error = passdoioctl(dev, cmd, addr, flag, td)) == ENOTTY) { - error = cam_compat_ioctl(dev, &cmd, &addr, &flag, td); - if (error == EAGAIN) - return (passdoioctl(dev, cmd, addr, flag, td)); + error = cam_compat_ioctl(dev, cmd, addr, flag, td, passdoioctl); } return (error); } |
