Module Name: src
Committed By: mlelstv
Date: Sun Aug 24 12:18:21 UTC 2014
Modified Files:
src/sys/arch/amiga/amiga: autoconf.c
Log Message:
use RAW_PART to trigger read of disklabel, other units might by busy due
to discovered wedges.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/amiga/amiga/autoconf.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/arch/amiga/amiga/autoconf.c
diff -u src/sys/arch/amiga/amiga/autoconf.c:1.116 src/sys/arch/amiga/amiga/autoconf.c:1.117
--- src/sys/arch/amiga/amiga/autoconf.c:1.116 Thu Dec 26 20:38:11 2013
+++ src/sys/arch/amiga/amiga/autoconf.c Sun Aug 24 12:18:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.116 2013/12/26 20:38:11 rkujawa Exp $ */
+/* $NetBSD: autoconf.c,v 1.117 2014/08/24 12:18:21 mlelstv Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.116 2013/12/26 20:38:11 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.117 2014/08/24 12:18:21 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -481,11 +481,11 @@ findroot(void)
maj = bdevsw_lookup_major(bdp);
/* Open disk; forces read of disklabel. */
- if ((*bdp->d_open)(MAKEDISKDEV(maj,
- unit, 0), FREAD|FNONBLOCK, 0, &lwp0))
+ if ((*bdp->d_open)(MAKEDISKDEV(maj, unit, RAW_PART),
+ FREAD|FNONBLOCK, 0, &lwp0))
continue;
- (void)(*bdp->d_close)(MAKEDISKDEV(maj,
- unit, 0), FREAD|FNONBLOCK, 0, &lwp0);
+ (void)(*bdp->d_close)(MAKEDISKDEV(maj, unit, RAW_PART),
+ FREAD|FNONBLOCK, 0, &lwp0);
pp = &dkp->dk_label->d_partitions[0];
if (pp->p_size != 0 && pp->p_fstype == FS_BSDFFS) {
