summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authormlelstv <mlelstv@NetBSD.org>2014-12-31 08:24:50 +0000
committermlelstv <mlelstv@NetBSD.org>2014-12-31 08:24:50 +0000
commit7eedcb4c1168b25e4c64d67085403c10fa91d037 (patch)
treec6e65db8e6eed682265f8413f508f60557b45e2c /sys/dev/raidframe
parent823f51c64db6c55351a577501d3de02047a898d2 (diff)
disk_blocksize and disk_set_info relay the same information
to the disk subsystem. Make disk_set_info also set blocksize shift values. Remove every call to disk_blocksize. Keep disk_blocksize for ABI compatibility, make it also set dg_secsize.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 2c30e2cb81f..6a40097a1d6 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.317 2014/12/21 17:04:12 taca Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.318 2014/12/31 08:24:50 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.317 2014/12/21 17:04:12 taca Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.318 2014/12/31 08:24:50 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2019,17 +2019,16 @@ raidinit(struct raid_softc *rs)
disk_init(&rs->sc_dkdev, rs->sc_xname, &rf_dkdriver);
disk_attach(&rs->sc_dkdev);
- disk_blocksize(&rs->sc_dkdev, raidPtr->bytesPerSector);
/* XXX There may be a weird interaction here between this, and
* protectedSectors, as used in RAIDframe. */
rs->sc_size = raidPtr->totalSectors;
- dkwedge_discover(&rs->sc_dkdev);
-
rf_set_geometry(rs, raidPtr);
+ dkwedge_discover(&rs->sc_dkdev);
+
}
#if (RF_INCLUDE_PARITY_DECLUSTERING_DS > 0)
/* wake up the daemon & tell it to get us a spare table