Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Apr 2011 10:41:13 +0000 (UTC)
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r220984 - head/sys/geom/eli
Message-ID:  <201104241041.p3OAfDsN027698@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104241041.p3OAfDsN027698>