Module Name: src
Committed By: mlelstv
Date: Sun Jul 19 08:05:24 UTC 2015
Modified Files:
src/sys/dev: dksubr.c
Log Message:
Handle non-DEV_BSIZE sectors.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/dksubr.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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.65 src/sys/dev/dksubr.c:1.66
--- src/sys/dev/dksubr.c:1.65 Sun Jul 12 05:57:06 2015
+++ src/sys/dev/dksubr.c Sun Jul 19 08:05:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.65 2015/07/12 05:57:06 mlelstv Exp $ */
+/* $NetBSD: dksubr.c,v 1.66 2015/07/19 08:05:24 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.65 2015/07/12 05:57:06 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.66 2015/07/19 08:05:24 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -259,7 +259,15 @@ dk_strategy(struct dk_softc *dksc, struc
}
}
- blkno = bp->b_blkno;
+ /*
+ * Convert the block number to absolute and put it in terms
+ * of the device's logical block size.
+ */
+ if (secsize >= DEV_BSIZE)
+ blkno = bp->b_blkno / (secsize / DEV_BSIZE);
+ else
+ blkno = bp->b_blkno * (DEV_BSIZE / secsize);
+
if (part != RAW_PART)
blkno += lp->d_partitions[DISKPART(bp->b_dev)].p_offset;
bp->b_rawblkno = blkno;
