Module Name:    src
Committed By:   martin
Date:           Thu Sep 12 20:07:05 UTC 2024

Modified Files:
        src/sys/dev [netbsd-10]: vnd.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #851):

        sys/dev/vnd.c: revision 1.290

Avoid division by zero when the backing file is revoked (e.g. from
umount -f).


To generate a diff of this commit:
cvs rdiff -u -r1.287.4.2 -r1.287.4.3 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.287.4.2 src/sys/dev/vnd.c:1.287.4.3
--- src/sys/dev/vnd.c:1.287.4.2	Thu Aug 17 10:00:01 2023
+++ src/sys/dev/vnd.c	Thu Sep 12 20:07:05 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnd.c,v 1.287.4.2 2023/08/17 10:00:01 martin Exp $	*/
+/*	$NetBSD: vnd.c,v 1.287.4.3 2024/09/12 20:07:05 martin 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.287.4.2 2023/08/17 10:00:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.287.4.3 2024/09/12 20:07:05 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vnd.h"
@@ -875,6 +875,9 @@ handle_with_strategy(struct vnd_softc *v
 	bn = obp->b_rawblkno * vnd->sc_dkdev.dk_label->d_secsize;
 
 	bsize = vnd->sc_vp->v_mount->mnt_stat.f_iosize;
+	/* use default if the filesystem didn't specify a block size */
+	if (bsize <= 0)
+		bsize = BLKDEV_IOSIZE;
 	skipped = 0;
 
 	/*

Reply via email to