Module Name: src
Committed By: msaitoh
Date: Mon Dec 22 02:19:32 UTC 2014
Modified Files:
src/sys/dev/raidframe [netbsd-7]: rf_netbsdkintf.c
Log Message:
Pull up following revision(s) (requested by taca in ticket #348):
sys/dev/raidframe/rf_netbsdkintf.c: revision 1.317
Stop useless disklabel warning if there are wedges, using GPT partition.
Fix PR kern/47989.
XXX: Pullup 6 and 7 (maybe 5)
To generate a diff of this commit:
cvs rdiff -u -r1.312.2.3 -r1.312.2.4 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.312.2.3 src/sys/dev/raidframe/rf_netbsdkintf.c:1.312.2.4
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.312.2.3 Tue Nov 18 18:03:10 2014
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Mon Dec 22 02:19:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.312.2.3 2014/11/18 18:03:10 snj Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.312.2.4 2014/12/22 02:19:32 msaitoh Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.312.2.3 2014/11/18 18:03:10 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.312.2.4 2014/12/22 02:19:32 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -800,6 +800,7 @@ raidopen(dev_t dev, int flags, int fmt,
pmask = (1 << part);
if ((rs->sc_flags & RAIDF_INITED) &&
+ (rs->sc_dkdev.dk_nwedges == 0) &&
(rs->sc_dkdev.dk_openmask == 0))
raidgetdisklabel(dev);
