From owner-svn-src-all@FreeBSD.ORG  Sun Apr 24 10:41:13 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F060106564A;
	Sun, 24 Apr 2011 10:41:13 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E66D8FC0C;
	Sun, 24 Apr 2011 10:41:13 +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 p3OAfDHM027700;
	Sun, 24 Apr 2011 10:41:13 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3OAfDsN027698;
	Sun, 24 Apr 2011 10:41:13 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201104241041.p3OAfDsN027698@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 24 Apr 2011 10:41:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220984 - head/sys/geom/eli
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Apr 2011 10:41:13 -0000

Author: pjd
Date: Sun Apr 24 10:41:13 2011
New Revision: 220984
URL: http://svn.freebsd.org/changeset/base/220984

Log:
  One key is expected from providers smaller than or equal to (2^20)*sectorsize
  bytes. Remove bogus assertion and while here remove another too obvious
  assertion.
  
  Reported by:	Fabian Keil <freebsd-listen@fabiankeil.de>
  MFC after:	2 weeks

Modified:
  head/sys/geom/eli/g_eli_key_cache.c

Modified: head/sys/geom/eli/g_eli_key_cache.c
==============================================================================
--- head/sys/geom/eli/g_eli_key_cache.c	Sun Apr 24 09:23:08 2011	(r220983)
+++ head/sys/geom/eli/g_eli_key_cache.c	Sun Apr 24 10:41:13 2011	(r220984)
@@ -263,12 +263,6 @@ g_eli_key_hold(struct g_eli_softc *sc, o
 	if ((sc->sc_flags & G_ELI_FLAG_SINGLE_KEY) != 0)
 		return (sc->sc_ekey);
 
-	KASSERT(sc->sc_ekeys_total > 1, ("%s: sc_ekeys_total=%ju", __func__,
-	    (uintmax_t)sc->sc_ekeys_total));
-	KASSERT((sc->sc_flags & G_ELI_FLAG_SINGLE_KEY) == 0,
-	    ("%s: SINGLE_KEY flag set, but sc_ekeys_total=%ju", __func__,
-	    (uintmax_t)sc->sc_ekeys_total));
-
 	/* We switch key every 2^G_ELI_KEY_SHIFT blocks. */
 	keyno = (offset >> G_ELI_KEY_SHIFT) / blocksize;