svn commit: r235201 - in head: sbin/geom/class/eli sys/geom/eli

[Eitan Adler]

Author: eadler
Date: Wed May  9 17:26:52 2012
New Revision: 235201
URL: http://svn.freebsd.org/changeset/base/235201

Log:
  Clarify error that geli generates
  when it finds corrupt data.
  
  PR:		kern/165695
  Submitted by:	Robert Simmons <rsimmons0 at gmail.com>
  Reviewed by:	pjd
  Approved by:	cperciva
  MFC after:	1 week

Modified:
  head/sbin/geom/class/eli/geli.8
  head/sys/geom/eli/g_eli_integrity.c

Modified: head/sbin/geom/class/eli/geli.8
==============================================================================
--- head/sbin/geom/class/eli/geli.8	Wed May  9 16:57:09 2012	(r235200)
+++ head/sbin/geom/class/eli/geli.8	Wed May  9 17:26:52 2012	(r235201)
@@ -924,6 +924,9 @@ will not protect your data against repla
 It is recommended to write to the whole provider before first use,
 in order to make sure that all sectors and their corresponding
 checksums are properly initialized into a consistent state.
+One can safely ignore data authentication errors that occur immediately
+after the first time a provider is attached and before it is
+initialized in this way.
 .Sh SEE ALSO
 .Xr crypto 4 ,
 .Xr gbde 4 ,

Modified: head/sys/geom/eli/g_eli_integrity.c
==============================================================================
--- head/sys/geom/eli/g_eli_integrity.c	Wed May  9 16:57:09 2012	(r235200)
+++ head/sys/geom/eli/g_eli_integrity.c	Wed May  9 17:26:52 2012	(r235201)
@@ -205,8 +205,8 @@ g_eli_auth_read_done(struct cryptop *crp
 				 * Report previous corruption if there was one.
 				 */
 				if (coroff != -1) {
-					G_ELI_DEBUG(0, "%s: %jd bytes "
-					    "corrupted at offset %jd.",
+					G_ELI_DEBUG(0, "%s: Failed to authenticate %jd "
+					    "bytes of data at offset %jd",
 					    sc->sc_name, (intmax_t)corsize,
 					    (intmax_t)coroff);
 					coroff = -1;
@@ -221,7 +221,8 @@ g_eli_auth_read_done(struct cryptop *crp
 		}
 		/* Report previous corruption if there was one. */
 		if (coroff != -1) {
-			G_ELI_DEBUG(0, "%s: %jd bytes corrupted at offset %jd.",
+			G_ELI_DEBUG(0, "%s: Failed to authenticate %jd "
+			    "bytes of data at offset %jd",
 			    sc->sc_name, (intmax_t)corsize, (intmax_t)coroff);
 		}
 	}