diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2016-05-24 00:57:11 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2016-05-24 00:57:11 +0000 |
| commit | 95320acebcdbd8ba6faba99bb31ba8a0c405c60c (patch) | |
| tree | 46aa22f07e1f507182e38a44b6dd148c8cda0479 /usr.sbin/camdd | |
| parent | 24d17f1e24b769e4473fc00c44562e33eb9ed4db (diff) | |
| download | src-95320acebcdbd8ba6faba99bb31ba8a0c405c60c.tar.gz src-95320acebcdbd8ba6faba99bb31ba8a0c405c60c.zip | |
Notes
Diffstat (limited to 'usr.sbin/camdd')
| -rw-r--r-- | usr.sbin/camdd/camdd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/usr.sbin/camdd/camdd.c b/usr.sbin/camdd/camdd.c index 02188898c81e..813e6a5e1b30 100644 --- a/usr.sbin/camdd/camdd.c +++ b/usr.sbin/camdd/camdd.c @@ -1305,8 +1305,7 @@ camdd_probe_pass(struct cam_device *cam_dev, struct camdd_io_opts *io_opts, goto bailout; } - bzero(&(&ccb->ccb_h)[1], - sizeof(struct ccb_scsiio) - sizeof(struct ccb_hdr)); + CCB_CLEAR_ALL_EXCEPT_HDR(&ccb->csio); scsi_read_capacity(&ccb->csio, /*retries*/ probe_retry_count, @@ -1387,8 +1386,7 @@ rcap_done: goto bailout_error; } - bzero(&(&ccb->ccb_h)[1], - sizeof(struct ccb_scsiio) - sizeof(struct ccb_hdr)); + CCB_CLEAR_ALL_EXCEPT_HDR(&ccb->cpi); ccb->ccb_h.func_code = XPT_PATH_INQ; ccb->ccb_h.flags = CAM_DIR_NONE; @@ -2439,8 +2437,7 @@ camdd_pass_run(struct camdd_dev *dev) data = &buf->buf_type_spec.data; ccb = &data->ccb; - bzero(&(&ccb->ccb_h)[1], - sizeof(struct ccb_scsiio) - sizeof(struct ccb_hdr)); + CCB_CLEAR_ALL_EXCEPT_HDR(&ccb->csio); /* * In almost every case the number of blocks should be the device |