Stop passing daddr_t parameters for lengths. Use long since that's the type

of the destination fields.

ok jsing@

4 files changed, 22 insertions, 21 deletions

diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index b0fb99b26b2..d2713ffab8b 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.357 2015/07/19 18:03:03 krw Exp $ */
+/* $OpenBSD: softraid.c,v 1.358 2015/07/19 18:24:16 krw Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -2013,7 +2013,7 @@ sr_ccb_put(struct sr_ccb *ccb)
 
 struct sr_ccb *
 sr_ccb_rw(struct sr_discipline *sd, int chunk, daddr_t blkno,
-    daddr_t len, u_int8_t *data, int xsflags, int ccbflags)
+    long len, u_int8_t *data, int xsflags, int ccbflags)
 {
 	struct sr_chunk		*sc = sd->sd_vol.sv_chunks[chunk];
 	struct sr_ccb		*ccb = NULL;
@@ -4422,7 +4422,7 @@ die:
 }
 
 void *
-sr_block_get(struct sr_discipline *sd, int length)
+sr_block_get(struct sr_discipline *sd, long length)
 {
 	return dma_alloc(length, PR_NOWAIT | PR_ZERO);
 }
diff --git a/sys/dev/softraid_raid5.c b/sys/dev/softraid_raid5.c
index cf55cd79e32..b26039baf21 100644
--- a/sys/dev/softraid_raid5.c
+++ b/sys/dev/softraid_raid5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid5.c,v 1.20 2015/07/19 17:04:31 krw Exp $ */
+/* $OpenBSD: softraid_raid5.c,v 1.21 2015/07/19 18:24:16 krw Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
@@ -58,12 +58,12 @@ int	sr_raid5_wu_done(struct sr_workunit *);
 void	sr_raid5_set_chunk_state(struct sr_discipline *, int, int);
 void	sr_raid5_set_vol_state(struct sr_discipline *);
 
-int	sr_raid5_addio(struct sr_workunit *wu, int, daddr_t, daddr_t,
+int	sr_raid5_addio(struct sr_workunit *wu, int, daddr_t, long,
 	    void *, int, int, void *);
-int	sr_raid5_regenerate(struct sr_workunit *, int, daddr_t, daddr_t,
+int	sr_raid5_regenerate(struct sr_workunit *, int, daddr_t, long,
 	    void *);
 int	sr_raid5_write(struct sr_workunit *, struct sr_workunit *, int, int,
-	    daddr_t, daddr_t, void *, int, int);
+	    daddr_t, long, void *, int, int);
 void	sr_raid5_xor(void *, void *, int);
 
 void	sr_raid5_rebuild(struct sr_discipline *);
@@ -377,7 +377,8 @@ sr_raid5_rw(struct sr_workunit *wu)
 	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;
+	int64_t			parity, row_size;
+	long			length, datalen;
 	void			*data;
 	int			s;
 
@@ -504,7 +505,7 @@ bad:
 
 int
 sr_raid5_regenerate(struct sr_workunit *wu, int chunk, daddr_t blkno,
-    daddr_t len, void *data)
+    long len, void *data)
 {
 	struct sr_discipline	*sd = wu->swu_dis;
 	int			i;
@@ -537,7 +538,7 @@ bad:
 
 int
 sr_raid5_write(struct sr_workunit *wu, struct sr_workunit *wu_r, int chunk,
-    int parity, daddr_t blkno, daddr_t len, void *data, int xsflags,
+    int parity, daddr_t blkno, long len, void *data, int xsflags,
     int ccbflags)
 {
 	struct sr_discipline	*sd = wu->swu_dis;
@@ -723,14 +724,14 @@ sr_raid5_wu_done(struct sr_workunit *wu)
 
 int
 sr_raid5_addio(struct sr_workunit *wu, int chunk, daddr_t blkno,
-    daddr_t len, void *data, int xsflags, int ccbflags, void *xorbuf)
+    long len, void *data, int xsflags, int ccbflags, void *xorbuf)
 {
 	struct sr_discipline	*sd = wu->swu_dis;
 	struct sr_ccb		*ccb;
 
 	DNPRINTF(SR_D_DIS, "sr_raid5_addio: %s chunk %d block %lld "
-	    "length %lld %s\n", (xsflags & SCSI_DATA_IN) ? "read" : "write",
-	    chunk, (long long)blkno, (long long)len, xorbuf ? "X0R" : "-");
+	    "length %ld %s\n", (xsflags & SCSI_DATA_IN) ? "read" : "write",
+	    chunk, (long long)blkno, len, xorbuf ? "X0R" : "-");
 
 	/* Allocate temporary buffer. */
 	if (data == NULL) {
diff --git a/sys/dev/softraid_raid6.c b/sys/dev/softraid_raid6.c
index 0ba663bfa4f..41b01de9dc6 100644
--- a/sys/dev/softraid_raid6.c
+++ b/sys/dev/softraid_raid6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid6.c,v 1.66 2015/07/19 17:04:31 krw Exp $ */
+/* $OpenBSD: softraid_raid6.c,v 1.67 2015/07/19 18:24:16 krw Exp $ */
 /*
  * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org>
@@ -62,7 +62,7 @@ void	sr_raid6_set_vol_state(struct sr_discipline *);
 
 void	sr_raid6_xorp(void *, void *, int);
 void	sr_raid6_xorq(void *, void *, int, int);
-int	sr_raid6_addio(struct sr_workunit *wu, int, daddr_t, daddr_t,
+int	sr_raid6_addio(struct sr_workunit *wu, int, daddr_t, long,
 	    void *, int, int, void *, void *, int);
 void	sr_raid6_scrub(struct sr_discipline *);
 int	sr_failio(struct sr_workunit *);
@@ -379,9 +379,9 @@ sr_raid6_rw(struct sr_workunit *wu)
 	int			s, fail, i, gxinv, pxinv;
 	daddr_t			blk, lba;
 	int64_t			chunk_offs, lbaoffs, phys_offs, strip_offs;
-	int64_t			strip_no, strip_size, strip_bits;
+	int64_t			strip_no, strip_size, strip_bits, row_size;
 	int64_t			fchunk, no_chunk, chunk, qchunk, pchunk;
-	int64_t			length, datalen, row_size;
+	long			length, datalen;
 	void			*pbuf, *data, *qbuf;
 
 	/* blk and scsi error will be handled by sr_validate_io */
@@ -731,7 +731,7 @@ sr_raid6_wu_done(struct sr_workunit *wu)
 
 int
 sr_raid6_addio(struct sr_workunit *wu, int chunk, daddr_t blkno,
-    daddr_t len, void *data, int xsflags, int ccbflags, void *pbuf,
+    long len, void *data, int xsflags, int ccbflags, void *pbuf,
     void *qbuf, int gn)
 {
 	struct sr_discipline	*sd = wu->swu_dis;
diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h
index cd07aad8bf0..721f9851bb2 100644
--- a/sys/dev/softraidvar.h
+++ b/sys/dev/softraidvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraidvar.h,v 1.159 2015/01/27 03:17:36 dlg Exp $ */
+/* $OpenBSD: softraidvar.h,v 1.160 2015/07/19 18:24:16 krw Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -644,7 +644,7 @@ void			sr_ccb_free(struct sr_discipline *);
 struct sr_ccb		*sr_ccb_get(struct sr_discipline *);
 void			sr_ccb_put(struct sr_ccb *);
 struct sr_ccb		*sr_ccb_rw(struct sr_discipline *, int, daddr_t,
-			    daddr_t, u_int8_t *, int, int);
+			    long, u_int8_t *, int, int);
 void			sr_ccb_done(struct sr_ccb *);
 int			sr_wu_alloc(struct sr_discipline *, int);
 void			sr_wu_free(struct sr_discipline *);
@@ -673,7 +673,7 @@ void			sr_meta_getdevname(struct sr_softc *, dev_t, char *,
 			    int);
 void			sr_meta_opt_load(struct sr_softc *,
 			    struct sr_metadata *, struct sr_meta_opt_head *);
-void			*sr_block_get(struct sr_discipline *, int);
+void			*sr_block_get(struct sr_discipline *, long);
 void			sr_block_put(struct sr_discipline *, void *, int);
 void			sr_checksum(struct sr_softc *, void *, void *,
 			    u_int32_t);