Module Name: src
Committed By: mlelstv
Date: Thu Dec 23 14:22:03 UTC 2010
Modified Files:
src/sys/dev/dkwedge: dk.c
Log Message:
Make wedges aware of underlying physical block size.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/dkwedge/dk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.57 src/sys/dev/dkwedge/dk.c:1.58
--- src/sys/dev/dkwedge/dk.c:1.57 Wed Aug 4 12:34:00 2010
+++ src/sys/dev/dkwedge/dk.c Thu Dec 23 14:22:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.57 2010/08/04 12:34:00 bouyer Exp $ */
+/* $NetBSD: dk.c,v 1.58 2010/12/23 14:22:03 mlelstv Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.57 2010/08/04 12:34:00 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.58 2010/12/23 14:22:03 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_dkwedge.h"
@@ -235,10 +235,11 @@
geom = prop_dictionary_create();
- prop_dictionary_set_uint64(geom, "sectors-per-unit", dkw->dkw_size);
+ prop_dictionary_set_uint64(geom, "sectors-per-unit",
+ dkw->dkw_size >> disk->dk_blkshift);
prop_dictionary_set_uint32(geom, "sector-size",
- DEV_BSIZE /* XXX 512? */);
+ DEV_BSIZE << disk->dk_blkshift);
prop_dictionary_set_uint32(geom, "sectors-per-track", 32);
@@ -432,6 +433,7 @@
*/
disk_init(&sc->sc_dk, device_xname(sc->sc_dev), NULL);
+ disk_blocksize(&sc->sc_dk, DEV_BSIZE << pdk->dk_blkshift);
dkgetproperties(&sc->sc_dk, dkw);
disk_attach(&sc->sc_dk);
