diff options
| author |   krw <krw@openbsd.org> | 2013-11-21 16:34:50 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2013-11-21 16:34:50 +0000 |
| commit | 3fb9c90bcd9396b9dc88ee71893afafd65667c87 (patch) | |
| tree | 2fc96fab7a2bcc9c8c2615cb3a3c2742ee35bdf6 /sys/dev/softraid_concat.c | |
| parent | hide a bunch of structures (namely arpcom, llinfo_arp, ethernet (diff) | |
| download | wireguard-openbsd-3fb9c90bcd9396b9dc88ee71893afafd65667c87.tar.xz wireguard-openbsd-3fb9c90bcd9396b9dc88ee71893afafd65667c87.zip | |
Change a bunch of daddr_t variables that don't (obviously) contain
512-byte-block information to int64_t, the underlying type of
daddr_t at the moment. No change to .o files. Removal of now
unneeded (long long) casts is next.
Diffstat (limited to 'sys/dev/softraid_concat.c')
| -rw-r--r-- | sys/dev/softraid_concat.c | 9 |
1 files changed, 5 insertions, 4 deletions
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 */ |