diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-10-14 23:26:24 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-10-14 23:26:24 +0000 |
| commit | e4fda8b349b0a8d68da083652a946c5d50020ac6 (patch) | |
| tree | cc9fde8510275e03eb5c9089c8990a4dc9086588 | |
| parent | f30aac5cc0dc877321988e1871b7742b03bb0f68 (diff) | |
XXsize() returns daddr_t, so calculate the return value in a daddr_t
variable and not (usually) an int.
ok miod@
| -rw-r--r-- | sys/arch/hp300/dev/hd.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/xd.c | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/xy.c | 5 | ||||
| -rw-r--r-- | sys/arch/vax/vsa/hdc9224.c | 4 | ||||
| -rw-r--r-- | sys/dev/ata/wd.c | 4 |
5 files changed, 12 insertions, 10 deletions
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c index 1cf333d3f21..36a40b58056 100644 --- a/sys/arch/hp300/dev/hd.c +++ b/sys/arch/hp300/dev/hd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hd.c,v 1.71 2013/06/28 18:17:12 miod Exp $ */ +/* $OpenBSD: hd.c,v 1.72 2013/10/14 23:26:22 krw Exp $ */ /* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */ /* @@ -1171,7 +1171,7 @@ hdsize(dev) struct hd_softc *rs; int unit = DISKUNIT(dev); int part, omask; - int size; + daddr_t size; rs = hdlookup(unit); if (rs == NULL) diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c index 391f0401569..f7dd8eba5ad 100644 --- a/sys/arch/sparc/dev/xd.c +++ b/sys/arch/sparc/dev/xd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xd.c,v 1.58 2013/06/11 16:42:11 deraadt Exp $ */ +/* $OpenBSD: xd.c,v 1.59 2013/10/14 23:26:22 krw Exp $ */ /* $NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $ */ /* @@ -971,7 +971,8 @@ xdsize(dev) { struct xd_softc *xdsc; - int unit, part, size, omask; + int unit, part, omask; + daddr_t size; /* valid unit? */ unit = DISKUNIT(dev); diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c index 6ae533295d4..561079a653e 100644 --- a/sys/arch/sparc/dev/xy.c +++ b/sys/arch/sparc/dev/xy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xy.c,v 1.54 2013/06/11 16:42:11 deraadt Exp $ */ +/* $OpenBSD: xy.c,v 1.55 2013/10/14 23:26:22 krw Exp $ */ /* $NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $ */ /* @@ -933,7 +933,8 @@ xysize(dev) { struct xy_softc *xysc; - int unit, part, size, omask; + int unit, part, omask; + daddr_t size; /* valid unit? */ unit = DISKUNIT(dev); diff --git a/sys/arch/vax/vsa/hdc9224.c b/sys/arch/vax/vsa/hdc9224.c index 0371a6d8804..af426a94243 100644 --- a/sys/arch/vax/vsa/hdc9224.c +++ b/sys/arch/vax/vsa/hdc9224.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hdc9224.c,v 1.40 2013/07/06 18:31:46 miod Exp $ */ +/* $OpenBSD: hdc9224.c,v 1.41 2013/10/14 23:26:22 krw Exp $ */ /* $NetBSD: hdc9224.c,v 1.16 2001/07/26 15:05:09 wiz Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -624,7 +624,7 @@ hdsize(dev_t dev) { struct hdsoftc *hd; int unit = DISKUNIT(dev); - int size; + daddr_t size; if (unit >= hd_cd.cd_ndevs || hd_cd.cd_devs[unit] == 0) return -1; diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index b98e21a49c0..2444b24cd62 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wd.c,v 1.112 2013/09/27 12:12:16 krw Exp $ */ +/* $OpenBSD: wd.c,v 1.113 2013/10/14 23:26:23 krw Exp $ */ /* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */ /* @@ -879,7 +879,7 @@ wdsize(dev_t dev) { struct wd_softc *wd; int part, omask; - int64_t size; + daddr_t size; WDCDEBUG_PRINT(("wdsize\n"), DEBUG_FUNCS); |