diff options
| author | mav <mav@FreeBSD.org> | 2011-12-13 11:13:28 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2011-12-13 11:13:28 +0000 |
| commit | bb0222f95e3e892736f522401b02d2c2ba049fe7 (patch) | |
| tree | be1104f7a38a3f900812e89ecc061dca06b35870 /share | |
| parent | b2bc09ab331217387974604e2bdbfe2e8c1a78c3 (diff) | |
| download | FreeBSD-src-bb0222f95e3e892736f522401b02d2c2ba049fe7.zip FreeBSD-src-bb0222f95e3e892736f522401b02d2c2ba049fe7.tar.gz | |
- Fix different variable types use in different files after r121184,
causing problems on amd64.
- s/%lud/%lu/.
MFC after: 1 month
Diffstat (limited to 'share')
| -rw-r--r-- | share/examples/scsi_target/scsi_cmds.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/share/examples/scsi_target/scsi_cmds.c b/share/examples/scsi_target/scsi_cmds.c index 10295d7..b0da04e 100644 --- a/share/examples/scsi_target/scsi_cmds.c +++ b/share/examples/scsi_target/scsi_cmds.c @@ -103,8 +103,8 @@ static struct targ_cdb_handlers cdb_handlers[] = { static struct scsi_inquiry_data inq_data; static struct initiator_state istates[MAX_INITIATORS]; extern int debug; -extern uint64_t volume_size; -extern size_t sector_size; +extern off_t volume_size; +extern u_int sector_size; extern size_t buf_size; cam_status @@ -609,7 +609,7 @@ start_io(struct ccb_accept_tio *atio, struct ccb_scsiio *ctio, int dir) if (dir == CAM_DIR_IN) { if (notaio) { if (debug) - warnx("read sync %lud @ block " OFF_FMT, + warnx("read sync %lu @ block " OFF_FMT, (unsigned long) (ctio->dxfer_len / sector_size), c_descr->offset / sector_size); @@ -625,7 +625,7 @@ start_io(struct ccb_accept_tio *atio, struct ccb_scsiio *ctio, int dir) } } else { if (debug) - warnx("read async %lud @ block " OFF_FMT, + warnx("read async %lu @ block " OFF_FMT, (unsigned long) (ctio->dxfer_len / sector_size), c_descr->offset / sector_size); @@ -725,7 +725,7 @@ tcmd_rdwr_done(struct ccb_accept_tio *atio, struct ccb_scsiio *ctio, a_descr->targ_req += ctio->dxfer_len; if (notaio) { if (debug) - warnx("write sync %lud @ block " + warnx("write sync %lu @ block " OFF_FMT, (unsigned long) (ctio->dxfer_len / sector_size), c_descr->offset / sector_size); @@ -742,7 +742,7 @@ tcmd_rdwr_done(struct ccb_accept_tio *atio, struct ccb_scsiio *ctio, tcmd_rdwr_done(atio, ctio, AIO_DONE); } else { if (debug) - warnx("write async %lud @ block " + warnx("write async %lu @ block " OFF_FMT, (unsigned long) (ctio->dxfer_len / sector_size), c_descr->offset / sector_size); |
