Module Name: src
Committed By: mlelstv
Date: Mon Jan 4 16:17:26 UTC 2021
Modified Files:
src/sys/dev: vnd.c
Log Message:
Fix calculation of cylinder count from medium size.
Pullups needed.
To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 src/sys/dev/vnd.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/vnd.c
diff -u src/sys/dev/vnd.c:1.277 src/sys/dev/vnd.c:1.278
--- src/sys/dev/vnd.c:1.277 Thu Apr 23 09:40:08 2020
+++ src/sys/dev/vnd.c Mon Jan 4 16:17:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.277 2020/04/23 09:40:08 jdolecek Exp $ */
+/* $NetBSD: vnd.c,v 1.278 2021/01/04 16:17:26 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008, 2020 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.277 2020/04/23 09:40:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.278 2021/01/04 16:17:26 mlelstv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vnd.h"
@@ -1456,8 +1456,9 @@ vndioctl(dev_t dev, u_long cmd, void *da
* Compute missing cylinder count from size
*/
if (vnd->sc_geom.vng_ncylinders == 0)
- vnd->sc_geom.vng_ncylinders = vnd->sc_size /
- (vnd->sc_geom.vng_ntracks *
+ vnd->sc_geom.vng_ncylinders = vnd->sc_size / (
+ (vnd->sc_geom.vng_secsize / DEV_BSIZE) *
+ vnd->sc_geom.vng_ntracks *
vnd->sc_geom.vng_nsectors);
/*
