From owner-p4-projects@FreeBSD.ORG Sat Dec 1 02:32:55 2007 Return-Path: <owner-p4-projects@FreeBSD.ORG> Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 854E416A420; Sat, 1 Dec 2007 02:32:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2FF9C16A41A for <perforce@freebsd.org>; Sat, 1 Dec 2007 02:32:55 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0574C13C4E9 for <perforce@freebsd.org>; Sat, 1 Dec 2007 02:32:55 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB12WsnC046125 for <perforce@freebsd.org>; Sat, 1 Dec 2007 02:32:54 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB12Wsge046122 for perforce@freebsd.org; Sat, 1 Dec 2007 02:32:54 GMT (envelope-from peter@freebsd.org) Date: Sat, 1 Dec 2007 02:32:54 GMT Message-Id: <200712010232.lB12Wsge046122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Cc: Subject: PERFORCE change 129860 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes <p4-projects.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/p4-projects> List-Post: <mailto:p4-projects@freebsd.org> List-Help: <mailto:p4-projects-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>, <mailto:p4-projects-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 01 Dec 2007 02:32:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=129860 Change 129860 by peter@peter_overcee on 2007/12/01 02:32:19 Kill a supposedly-busted promotion from DIAGNOSTIC to INVARIANTS Affected files ... .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#33 edit Differences ... ==== //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#33 (text+ko) ==== @@ -552,7 +552,7 @@ if (end_lvl == 0 || (idp = &end_ap[end_lvl - 1])->in_off + 1 >= len) { ssize = len; } else { -#ifdef INVARIANTS +#ifdef INVARIANTS_busted if (start_ap[start_lvl-1].in_lbn == idp->in_lbn) panic("ffs_reallocblk: start == end"); #endif