[Midnightbsd-cvs] src [9966] trunk/sys/geom/vinum: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 9966
          http://svnweb.midnightbsd.org/src/?rev=9966
Author:   laffer1
Date:     2018-05-26 11:18:24 -0400 (Sat, 26 May 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/sys/geom/vinum/geom_vinum_rm.c
    trunk/sys/geom/vinum/geom_vinum_state.c

Modified: trunk/sys/geom/vinum/geom_vinum_rm.c
===================================================================
--- trunk/sys/geom/vinum/geom_vinum_rm.c	2018-05-26 15:16:10 UTC (rev 9965)
+++ trunk/sys/geom/vinum/geom_vinum_rm.c	2018-05-26 15:18:24 UTC (rev 9966)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  *  Copyright (c) 2004, 2007 Lukas Ertl
  *  All rights reserved.
@@ -26,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/geom/vinum/geom_vinum_rm.c 306765 2016-10-06 15:36:13Z mav $");
 
 #include <sys/param.h>
 #include <sys/libkern.h>
@@ -223,8 +224,7 @@
 	/* Get rid of the volume's provider. */
 	if (pp != NULL) {
 		g_topology_lock();
-		pp->flags |= G_PF_WITHER;
-		g_orphan_provider(pp, ENXIO);
+		g_wither_provider(pp, ENXIO);
 		g_topology_unlock();
 	}
 }

Modified: trunk/sys/geom/vinum/geom_vinum_state.c
===================================================================
--- trunk/sys/geom/vinum/geom_vinum_state.c	2018-05-26 15:16:10 UTC (rev 9965)
+++ trunk/sys/geom/vinum/geom_vinum_state.c	2018-05-26 15:18:24 UTC (rev 9966)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2004, 2007 Lukas Ertl
  * All rights reserved.
@@ -25,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/geom/vinum/geom_vinum_state.c 311939 2017-01-11 21:01:49Z dim $");
 
 #include <sys/libkern.h>
 #include <sys/malloc.h>
@@ -183,7 +184,7 @@
 		 * Only do this if we're forced, since it usually is done
 		 * internally, and then we do use the force flag. 
 		 */
-		if (!flags & GV_SETSTATE_FORCE)
+		if (!(flags & GV_SETSTATE_FORCE))
 			return (GV_ERR_SETSTATE);
 		break;