diff options
| author | taca <taca@NetBSD.org> | 2014-12-21 17:04:12 +0000 |
|---|---|---|
| committer | taca <taca@NetBSD.org> | 2014-12-21 17:04:12 +0000 |
| commit | 834e42975b656bf739769ca5d109c3b885b71370 (patch) | |
| tree | 234bab9d00c02c809b21d9d3b99443bd53608f17 /sys/dev/raidframe | |
| parent | 50d9bbddea4dac1bf81f69947af70ad607b6de01 (diff) | |
Stop useless disklabel warning if there are wedges, using GPT partition.
Fix PR kern/47989.
XXX: Pullup 6 and 7 (maybe 5)
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_netbsdkintf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c index 5a205e331ec..2c30e2cb81f 100644 --- a/sys/dev/raidframe/rf_netbsdkintf.c +++ b/sys/dev/raidframe/rf_netbsdkintf.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_netbsdkintf.c,v 1.316 2014/11/14 14:29:16 oster Exp $ */ +/* $NetBSD: rf_netbsdkintf.c,v 1.317 2014/12/21 17:04:12 taca 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.316 2014/11/14 14:29:16 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.317 2014/12/21 17:04:12 taca 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); |
