[Midnightbsd-cvs] src [9973] trunk/sys/geom/bde: sync with freebsd.

[laffer1 at midnightbsd.org]

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

Modified Paths:
--------------
    trunk/sys/geom/bde/g_bde.c
    trunk/sys/geom/bde/g_bde.h
    trunk/sys/geom/bde/g_bde_crypt.c
    trunk/sys/geom/bde/g_bde_lock.c
    trunk/sys/geom/bde/g_bde_work.c

Modified: trunk/sys/geom/bde/g_bde.c
===================================================================
--- trunk/sys/geom/bde/g_bde.c	2018-05-26 15:26:32 UTC (rev 9972)
+++ trunk/sys/geom/bde/g_bde.c	2018-05-26 15:26:55 UTC (rev 9973)
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/geom/bde/g_bde.c,v 1.29 2005/03/11 15:42:51 ume Exp $
+ * $FreeBSD: stable/10/sys/geom/bde/g_bde.c 314327 2017-02-27 08:27:38Z avg $
  *
  */
 
@@ -45,7 +45,7 @@
 #include <sys/sysctl.h>
 
 #include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha512.h>
 #include <geom/geom.h>
 #include <geom/bde/g_bde.h>
 #define BDE_CLASS_NAME "BDE"
@@ -86,7 +86,7 @@
 	sc = gp->softc;
 	gp->flags |= G_GEOM_WITHER;
 	LIST_FOREACH(pp, &gp->provider, provider)
-		g_orphan_provider(pp, ENXIO);
+		g_wither_provider(pp, ENXIO);
 	bzero(sc, sizeof(struct g_bde_softc));	/* destroy evidence */
 	return;
 }
@@ -186,14 +186,6 @@
 		kproc_create(g_bde_worker, gp, &sc->thread, 0, 0,
 			"g_bde %s", gp->name);
 		pp = g_new_providerf(gp, "%s", gp->name);
-#if 0
-		/*
-		 * XXX: Disable this for now.  Appearantly UFS no longer
-		 * XXX: issues BIO_DELETE requests correctly, with the obvious
-		 * XXX: outcome that userdata is trashed.
-		 */
-		pp->flags |= G_PF_CANDELETE;
-#endif
 		pp->stripesize = kp->zone_cont;
 		pp->stripeoffset = 0;
 		pp->mediasize = sc->mediasize;

Modified: trunk/sys/geom/bde/g_bde.h
===================================================================
--- trunk/sys/geom/bde/g_bde.h	2018-05-26 15:26:32 UTC (rev 9972)
+++ trunk/sys/geom/bde/g_bde.h	2018-05-26 15:26:55 UTC (rev 9973)
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/geom/bde/g_bde.h,v 1.6 2003/10/07 09:28:07 phk Exp $
+ * $FreeBSD: stable/10/sys/geom/bde/g_bde.h 120876 2003-10-07 09:28:07Z phk $
  */
 
 #ifndef _SYS_GEOM_BDE_G_BDE_H_

Modified: trunk/sys/geom/bde/g_bde_crypt.c
===================================================================
--- trunk/sys/geom/bde/g_bde_crypt.c	2018-05-26 15:26:32 UTC (rev 9972)
+++ trunk/sys/geom/bde/g_bde_crypt.c	2018-05-26 15:26:55 UTC (rev 9973)
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/geom/bde/g_bde_crypt.c,v 1.23 2005/07/20 18:08:16 phk Exp $
+ * $FreeBSD: stable/10/sys/geom/bde/g_bde_crypt.c 314327 2017-02-27 08:27:38Z avg $
  */
 /* This source file contains the functions responsible for the crypto, keying
  * and mapping operations on the I/O requests.
@@ -48,7 +48,7 @@
 #include <sys/md5.h>
 
 #include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha512.h>
 
 #include <geom/geom.h>
 #include <geom/bde/g_bde.h>

Modified: trunk/sys/geom/bde/g_bde_lock.c
===================================================================
--- trunk/sys/geom/bde/g_bde_lock.c	2018-05-26 15:26:32 UTC (rev 9972)
+++ trunk/sys/geom/bde/g_bde_lock.c	2018-05-26 15:26:55 UTC (rev 9973)
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/geom/bde/g_bde_lock.c,v 1.17 2005/11/30 19:07:28 sobomax Exp $
+ * $FreeBSD: stable/10/sys/geom/bde/g_bde_lock.c 314327 2017-02-27 08:27:38Z avg $
  */
 /* This souce file contains routines which operates on the lock sectors, both
  * for the kernel and the userland program gbde(1).
@@ -59,7 +59,7 @@
 #endif
 
 #include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha512.h>
 
 #include <geom/geom.h>
 #include <geom/bde/g_bde.h>

Modified: trunk/sys/geom/bde/g_bde_work.c
===================================================================
--- trunk/sys/geom/bde/g_bde_work.c	2018-05-26 15:26:32 UTC (rev 9972)
+++ trunk/sys/geom/bde/g_bde_work.c	2018-05-26 15:26:55 UTC (rev 9973)
@@ -1,4 +1,4 @@
-/* $MidnightBSD: src/sys/geom/bde/g_bde_work.c,v 1.4 2008/12/03 00:25:46 laffer1 Exp $ */
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002 Poul-Henning Kamp
  * Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/geom/bde/g_bde_work.c,v 1.28 2006/08/04 07:56:34 yar Exp $
+ * $FreeBSD: stable/10/sys/geom/bde/g_bde_work.c 314327 2017-02-27 08:27:38Z avg $
  */
 /*
  * This source file contains the state-engine which makes things happen in the
@@ -72,7 +72,7 @@
 #include <sys/kthread.h>
 
 #include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha512.h>
 #include <geom/geom.h>
 #include <geom/bde/g_bde.h>