summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2015-10-05 09:24:08 +0000
committermav <mav@FreeBSD.org>2015-10-05 09:24:08 +0000
commit940d22f32ea86db81428d39777706f83ebb8c947 (patch)
treee0f47848f304effc523723acfb71e5beabfd6ffb
parent03f85b4859e09eaf3b0e12668b5acc45b7f33de2 (diff)
downloadFreeBSD-src-940d22f32ea86db81428d39777706f83ebb8c947.zip
FreeBSD-src-940d22f32ea86db81428d39777706f83ebb8c947.tar.gz
MFC r287860: Frontends don't need to set errors themselves.
-rw-r--r--sys/cam/ctl/ctl_frontend_ioctl.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/sys/cam/ctl/ctl_frontend_ioctl.c b/sys/cam/ctl/ctl_frontend_ioctl.c
index 67156bc..fc3d15a 100644
--- a/sys/cam/ctl/ctl_frontend_ioctl.c
+++ b/sys/cam/ctl/ctl_frontend_ioctl.c
@@ -157,11 +157,8 @@ ctl_ioctl_do_datamove(struct ctl_scsiio *ctsio)
ext_sglist = (struct ctl_sg_entry *)malloc(ext_sglen, M_CTL,
M_WAITOK);
ext_sglist_malloced = 1;
- if (copyin(ctsio->ext_data_ptr, ext_sglist,
- ext_sglen) != 0) {
- ctl_set_internal_failure(ctsio,
- /*sks_valid*/ 0,
- /*retry_count*/ 0);
+ if (copyin(ctsio->ext_data_ptr, ext_sglist, ext_sglen) != 0) {
+ ctsio->io_hdr.port_status = 31343;
goto bailout;
}
ext_sg_entries = ctsio->ext_sg_entries;
@@ -229,9 +226,7 @@ ctl_ioctl_do_datamove(struct ctl_scsiio *ctsio)
CTL_DEBUG_PRINT(("ctl_ioctl_do_datamove: from %p "
"to %p\n", kern_ptr, ext_ptr));
if (copyout(kern_ptr, ext_ptr, len_to_copy) != 0) {
- ctl_set_internal_failure(ctsio,
- /*sks_valid*/ 0,
- /*retry_count*/ 0);
+ ctsio->io_hdr.port_status = 31344;
goto bailout;
}
} else {
@@ -240,9 +235,7 @@ ctl_ioctl_do_datamove(struct ctl_scsiio *ctsio)
CTL_DEBUG_PRINT(("ctl_ioctl_do_datamove: from %p "
"to %p\n", ext_ptr, kern_ptr));
if (copyin(ext_ptr, kern_ptr, len_to_copy)!= 0){
- ctl_set_internal_failure(ctsio,
- /*sks_valid*/ 0,
- /*retry_count*/0);
+ ctsio->io_hdr.port_status = 31345;
goto bailout;
}
}
OpenPOWER on IntegriCloud