[src/netbsd-6]: src/sys/dev/raidframe Pull up following revision(s) (requeste...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f777924daea3
branches:  netbsd-6
changeset: 776834:f777924daea3
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Dec 22 04:11:38 2014 +0000

description:
Pull up following revision(s) (requested by taca in ticket #1216):
        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)

diffstat:

 sys/dev/raidframe/rf_netbsdkintf.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 29fa1791d832 -r f777924daea3 sys/dev/raidframe/rf_netbsdkintf.c
--- a/sys/dev/raidframe/rf_netbsdkintf.c        Sun Dec 21 20:26:30 2014 +0000
+++ b/sys/dev/raidframe/rf_netbsdkintf.c        Mon Dec 22 04:11:38 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_netbsdkintf.c,v 1.295.6.3 2014/12/02 22:05:14 snj Exp $     */
+/*     $NetBSD: rf_netbsdkintf.c,v 1.295.6.4 2014/12/22 04:11:38 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.295.6.3 2014/12/02 22:05:14 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.295.6.4 2014/12/22 04:11:38 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -735,6 +735,7 @@
        pmask = (1 << part);
 
        if ((rs->sc_flags & RAIDF_INITED) &&
+           (rs->sc_dkdev.dk_nwedges == 0) &&
            (rs->sc_dkdev.dk_openmask == 0))
                raidgetdisklabel(dev);