From owner-svn-src-stable@FreeBSD.ORG Wed May 16 00:37:37 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DCF64106564A; Wed, 16 May 2012 00:37:37 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AB0E38FC16; Wed, 16 May 2012 00:37:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4G0bbJS014193; Wed, 16 May 2012 00:37:37 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4G0bbCC014190; Wed, 16 May 2012 00:37:37 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201205160037.q4G0bbCC014190@svn.freebsd.org> From: Eitan Adler Date: Wed, 16 May 2012 00:37:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235498 - in stable/9: sbin/geom/class/eli sys/geom/eli X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 May 2012 00:37:38 -0000 Author: eadler Date: Wed May 16 00:37:37 2012 New Revision: 235498 URL: http://svn.freebsd.org/changeset/base/235498 Log: MFC r235201 r235419: Add missing period at the end of the error message Approved by: cperciva (implicit) Modified: stable/9/sbin/geom/class/eli/geli.8 stable/9/sys/geom/eli/g_eli_integrity.c Directory Properties: stable/9/sbin/geom/ (props changed) stable/9/sys/ (props changed) Modified: stable/9/sbin/geom/class/eli/geli.8 ============================================================================== --- stable/9/sbin/geom/class/eli/geli.8 Wed May 16 00:37:15 2012 (r235497) +++ stable/9/sbin/geom/class/eli/geli.8 Wed May 16 00:37:37 2012 (r235498) @@ -899,6 +899,9 @@ will not protect your data against repla It is recommended to write the whole provider before the 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: stable/9/sys/geom/eli/g_eli_integrity.c ============================================================================== --- stable/9/sys/geom/eli/g_eli_integrity.c Wed May 16 00:37:15 2012 (r235497) +++ stable/9/sys/geom/eli/g_eli_integrity.c Wed May 16 00:37:37 2012 (r235498) @@ -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); } }