From owner-svn-src-head@FreeBSD.ORG Thu Sep 16 08:59:11 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E5B2106564A; Thu, 16 Sep 2010 08:59:11 +0000 (UTC) (envelope-from prvs=18684819c6=brian@FreeBSD.org) Received: from idcmail-mo1so.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10]) by mx1.freebsd.org (Postfix) with ESMTP id C106C8FC0A; Thu, 16 Sep 2010 08:59:10 +0000 (UTC) Received: from pd2ml1so-ssvc.prod.shaw.ca ([10.0.141.139]) by pd2mo1so-svcs.prod.shaw.ca with ESMTP; 16 Sep 2010 02:44:08 -0600 X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=6EkEX6JM2LCztCEhkE317K9SpBSN4cB8nbuuHVfFIzI= c=1 sm=1 a=9fUDse7kmeoA:10 a=BLceEmwcHowA:10 a=kj9zAlcOel0A:10 a=MJPcHhXccCG8eBs0us8XwA==:17 a=6I5d2MoRAAAA:8 a=MMwg4So0AAAA:8 a=bQswk-ucj_17iOK-MwkA:9 a=_7DtvMzIEwt9-Y0m_bUA:7 a=8hhyb2-YBQI508o0oNYS5gFcixEA:4 a=CjuIK1q_8ugA:10 a=SV7veod9ZcQA:10 a=WJ3hkfHDukgA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Received: from unknown (HELO store.lan.Awfulhak.org) ([70.79.162.198]) by pd2ml1so-dmz.prod.shaw.ca with ESMTP; 16 Sep 2010 02:44:08 -0600 Received: from store.lan.Awfulhak.org (localhost.localdomain [127.0.0.1]) by localhost (Email Security Appliance) with SMTP id 44048C433AC_C91D8D8B; Thu, 16 Sep 2010 08:44:08 +0000 (GMT) Received: from gw.Awfulhak.org (gw.lan.Awfulhak.org [172.16.0.1]) by store.lan.Awfulhak.org (Sophos Email Appliance) with ESMTP id EA1F2C460F7_C91D8D4F; Thu, 16 Sep 2010 08:44:04 +0000 (GMT) Received: from dev.lan.Awfulhak.org (brian@dev.lan.Awfulhak.org [172.16.0.5]) by gw.Awfulhak.org (8.14.4/8.14.4) with ESMTP id o8G8i49M036858; Thu, 16 Sep 2010 01:44:04 -0700 (PDT) (envelope-from brian@FreeBSD.org) Date: Thu, 16 Sep 2010 01:44:04 -0700 From: Brian Somers To: Kirk McKusick Message-ID: <20100916014404.0409017f@dev.lan.Awfulhak.org> In-Reply-To: <201009141804.o8EI45kp088466@svn.freebsd.org> References: <201009141804.o8EI45kp088466@svn.freebsd.org> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.20.1; i386-portbld-freebsd9.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r212617 - head/sys/ufs/ffs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2010 08:59:11 -0000 On Tue, 14 Sep 2010 18:04:05 +0000 (UTC) Kirk McKusick wrote: > Author: mckusick > Date: Tue Sep 14 18:04:05 2010 > New Revision: 212617 > URL: http://svn.freebsd.org/changeset/base/212617 > > Log: > Update comments in soft updates code to more fully describe > the addition of journalling. Only functional change is to > tighten a KASSERT. > > Reviewed by: jeff Roberson > > Modified: > head/sys/ufs/ffs/ffs_softdep.c > head/sys/ufs/ffs/fs.h > head/sys/ufs/ffs/softdep.h > > Modified: head/sys/ufs/ffs/ffs_softdep.c > ============================================================================== > --- head/sys/ufs/ffs/ffs_softdep.c Tue Sep 14 17:22:06 2010 (r212616) > +++ head/sys/ufs/ffs/ffs_softdep.c Tue Sep 14 18:04:05 2010 (r212617) > @@ -2378,7 +2378,8 @@ remove_from_journal(wk) > /* > * We emulate a TAILQ to save space in most structures which do not > * require TAILQ semantics. Here we must update the tail position > - * when removing the tail which is not the final entry. > + * when removing the tail which is not the final entry. This works > + * only if the worklist linkage are at the beginning of the structure. > */ > if (ump->softdep_journal_tail == wk) > ump->softdep_journal_tail = > @@ -2605,7 +2606,7 @@ jremref_write(jremref, jseg, data) > inoref_write(&jremref->jr_ref, jseg, rec); > } > > -static void > +static void > jmvref_write(jmvref, jseg, data) > struct jmvref *jmvref; > struct jseg *jseg; > @@ -2906,9 +2907,9 @@ complete_jseg(jseg) > waiting = wk->wk_state & IOWAITING; > wk->wk_state &= ~(IOSTARTED | IOWAITING); > wk->wk_state |= COMPLETE; > - KASSERT(i < jseg->js_cnt, > + KASSERT(i++ < jseg->js_cnt, > ("handle_written_jseg: overflow %d >= %d", [.....] If INVARIANTS is not defined, the above i++ will not happen. -- Brian Somers Don't _EVER_ lose your sense of humour !