diff options
| -rw-r--r-- | sys/dev/softraid_aoe.c | 5 | ||||
| -rw-r--r-- | sys/dev/softraid_concat.c | 9 | ||||
| -rw-r--r-- | sys/dev/softraid_raid0.c | 10 | ||||
| -rw-r--r-- | sys/dev/softraid_raid6.c | 10 | ||||
| -rw-r--r-- | sys/dev/softraid_raidp.c | 14 |
5 files changed, 28 insertions, 20 deletions
diff --git a/sys/dev/softraid_aoe.c b/sys/dev/softraid_aoe.c index c565ead5a36..3380f735b29 100644 --- a/sys/dev/softraid_aoe.c +++ b/sys/dev/softraid_aoe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_aoe.c,v 1.34 2013/09/20 08:08:45 tedu Exp $ */ +/* $OpenBSD: softraid_aoe.c,v 1.35 2013/11/21 16:34:50 krw Exp $ */ /* * Copyright (c) 2008 Ted Unangst <tedu@openbsd.org> * Copyright (c) 2008 Marco Peereboom <marco@openbsd.org> @@ -464,7 +464,8 @@ sr_aoe_request_done(struct aoe_req *ar, struct aoe_packet *ap) struct sr_discipline *sd; struct scsi_xfer *xs; struct sr_workunit *wu; - daddr_t blk, offset; + daddr_t blk; + int64_t offset; int len, s; wu = ar->v; diff --git a/sys/dev/softraid_concat.c b/sys/dev/softraid_concat.c index dd7dad77f13..58a40b0af6b 100644 --- a/sys/dev/softraid_concat.c +++ b/sys/dev/softraid_concat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_concat.c,v 1.18 2013/11/01 17:36:19 krw Exp $ */ +/* $OpenBSD: softraid_concat.c,v 1.19 2013/11/21 16:34:50 krw Exp $ */ /* * Copyright (c) 2008 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2011 Joel Sing <jsing@openbsd.org> @@ -98,9 +98,10 @@ sr_concat_rw(struct sr_workunit *wu) struct scsi_xfer *xs = wu->swu_xs; struct sr_ccb *ccb; struct sr_chunk *scp; - daddr_t blk, lbaoffs, chunk, chunksize; - daddr_t no_chunk, chunkend, physoffs; - daddr_t length, leftover; + daddr_t blk; + int64_t lbaoffs, physoffs; + int64_t no_chunk, chunkend, chunk, chunksize; + int64_t length, leftover; u_int8_t *data; /* blk and scsi error will be handled by sr_validate_io */ diff --git a/sys/dev/softraid_raid0.c b/sys/dev/softraid_raid0.c index 570a213271f..59267b6e55b 100644 --- a/sys/dev/softraid_raid0.c +++ b/sys/dev/softraid_raid0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_raid0.c,v 1.43 2013/11/05 08:55:58 reyk Exp $ */ +/* $OpenBSD: softraid_raid0.c,v 1.44 2013/11/21 16:34:50 krw Exp $ */ /* * Copyright (c) 2008 Marco Peereboom <marco@peereboom.us> * @@ -121,9 +121,11 @@ sr_raid0_rw(struct sr_workunit *wu) struct scsi_xfer *xs = wu->swu_xs; struct sr_ccb *ccb; struct sr_chunk *scp; - daddr_t blk, lbaoffs, strip_no, chunk, stripoffs; - daddr_t strip_size, no_chunk, chunkoffs, physoffs; - daddr_t strip_bits, length, leftover; + daddr_t blk; + int64_t chunkoffs, lbaoffs, physoffs, stripoffs; + int64_t strip_bits, strip_no, strip_size; + int64_t chunk, no_chunk; + int64_t length, leftover; u_int8_t *data; /* blk and scsi error will be handled by sr_validate_io */ diff --git a/sys/dev/softraid_raid6.c b/sys/dev/softraid_raid6.c index 6fb453847c8..d82cb2d902b 100644 --- a/sys/dev/softraid_raid6.c +++ b/sys/dev/softraid_raid6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_raid6.c,v 1.55 2013/11/05 08:55:58 reyk Exp $ */ +/* $OpenBSD: softraid_raid6.c,v 1.56 2013/11/21 16:34:50 krw Exp $ */ /* * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org> @@ -382,9 +382,11 @@ sr_raid6_rw(struct sr_workunit *wu) struct scsi_xfer *xs = wu->swu_xs; struct sr_chunk *scp; int s, fail, i, gxinv, pxinv; - daddr_t blk, lbaoffs, strip_no, chunk, qchunk, pchunk, fchunk; - daddr_t strip_size, no_chunk, lba, chunk_offs, phys_offs; - daddr_t strip_bits, length, strip_offs, datalen, row_size; + daddr_t blk, lba; + int64_t chunk_offs, lbaoffs, phys_offs, strip_offs; + int64_t strip_no, strip_size, strip_bits; + int64_t fchunk, no_chunk, chunk, qchunk, pchunk; + int64_t length, datalen, row_size; void *pbuf, *data, *qbuf; /* blk and scsi error will be handled by sr_validate_io */ diff --git a/sys/dev/softraid_raidp.c b/sys/dev/softraid_raidp.c index 54e2a3ccee4..3f8f052ee3d 100644 --- a/sys/dev/softraid_raidp.c +++ b/sys/dev/softraid_raidp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_raidp.c,v 1.53 2013/11/05 08:55:58 reyk Exp $ */ +/* $OpenBSD: softraid_raidp.c,v 1.54 2013/11/21 16:34:51 krw Exp $ */ /* * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org> @@ -338,9 +338,11 @@ sr_raidp_rw(struct sr_workunit *wu) struct scsi_xfer *xs = wu->swu_xs; struct sr_chunk *scp; int s, i; - daddr_t blk, lbaoffs, strip_no, chunk, row_size; - daddr_t strip_size, no_chunk, lba, chunk_offs, phys_offs; - daddr_t strip_bits, length, parity, strip_offs, datalen; + daddr_t blk, lba; + int64_t chunk_offs, lbaoffs, phys_offs, strip_offs; + int64_t strip_bits, strip_no, strip_size; + int64_t chunk, no_chunk; + int64_t length, parity, datalen, row_size; void *xorbuf, *data; /* blk and scsi error will be handled by sr_validate_io */ @@ -632,8 +634,8 @@ sr_raidp_xor(void *a, void *b, int len) void sr_raidp_scrub(struct sr_discipline *sd) { - daddr_t strip_no, strip_size, no_chunk, parity, max_strip, strip_bits; - daddr_t i; + int64_t strip_no, strip_size, no_chunk, parity, max_strip, strip_bits; + int64_t i; struct sr_workunit *wu_r, *wu_w; int s, slept; void *xorbuf; |