Module Name: src
Committed By: martin
Date: Thu Sep 12 19:33:47 UTC 2024
Modified Files:
src/sys/dev/dkwedge [netbsd-10]: dkwedge_mbr.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #839):
sys/dev/dkwedge/dkwedge_mbr.c: revision 1.13
In case of trouble reading an MBR, make sure error field is set before
reporting it
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.20.1 src/sys/dev/dkwedge/dkwedge_mbr.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/dkwedge_mbr.c
diff -u src/sys/dev/dkwedge/dkwedge_mbr.c:1.12 src/sys/dev/dkwedge/dkwedge_mbr.c:1.12.20.1
--- src/sys/dev/dkwedge/dkwedge_mbr.c:1.12 Sat Apr 11 16:00:34 2020
+++ src/sys/dev/dkwedge/dkwedge_mbr.c Thu Sep 12 19:33:47 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dkwedge_mbr.c,v 1.12 2020/04/11 16:00:34 jdolecek Exp $ */
+/* $NetBSD: dkwedge_mbr.c,v 1.12.20.1 2024/09/12 19:33:47 martin Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_mbr.c,v 1.12 2020/04/11 16:00:34 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_mbr.c,v 1.12.20.1 2024/09/12 19:33:47 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,9 +90,9 @@ getparts(mbr_args_t *a, uint32_t off, ui
error = dkwedge_read(a->pdk, a->vp, off, a->bp->b_data, a->secsize);
if (error) {
+ a->error = error;
aprint_error("%s: unable to read MBR @ %u/%u, "
"error = %d\n", a->pdk->dk_name, off, a->secsize, a->error);
- a->error = error;
return;
}
