From owner-svn-src-all@freebsd.org Tue Mar 12 05:36:37 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0949715454D0; Tue, 12 Mar 2019 05:36:37 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id B88A07552A; Tue, 12 Mar 2019 05:36:35 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id 3a5RhmxIfBEqw3a5She4iO; Mon, 11 Mar 2019 23:36:27 -0600 X-Authority-Analysis: v=2.3 cv=KLsk82No c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=NTGMnVQrEZIA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=cTdznIEMGrY7a0xPgYYA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id EB698644; Mon, 11 Mar 2019 22:36:24 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id x2C5aOwQ077065; Mon, 11 Mar 2019 22:36:24 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id x2C5aOL5077062; Mon, 11 Mar 2019 22:36:24 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201903120536.x2C5aOL5077062@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Warner Losh cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r345052 - head/sys/kern In-Reply-To: Message from Warner Losh of "Tue, 12 Mar 2019 05:10:41 -0000." <201903120510.x2C5Afs9081736@repo.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Mon, 11 Mar 2019 22:36:24 -0700 X-CMAE-Envelope: MS4wfIajubdj2VFnG2Ru9+IKrQ1FQjGzN6Zab0ZeqL6C32e0MsBmX+vXxRI7YAiv7aL0cejiTWF0ZoMv9qt52EEWmxckEwaF+8sZeBtyO/NlWLXoSjRcpmUk 12TPdtTORLMyqTYReO/tknwCla+F3Yr7XvZqG7T+rUKkyjbmY8M8XGA6LzFO5gDy4QEuealVyb4STi83c5hrjmtkSq6qMZoD/M5uTOlL8k2/NaMvhlsnQ/BI ftsbugxYTs7TW/gM7VRbYWqjvP+pRItAsgpXHPfXd5EPgKQY8VimRc1ElybgHsCB X-Rspamd-Queue-Id: B88A07552A X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-4.58 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MV_CASE(0.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; REPLYTO_EQ_FROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MX_GOOD(-0.01)[cached: spqr.komquats.com]; NEURAL_HAM_SHORT(-0.63)[-0.626,0]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[17.125.67.70.zen.spamhaus.org : 127.0.0.11]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; MIME_TRACE(0.00)[0:+]; IP_SCORE(-2.24)[ip: (-6.16), ipnet: 64.59.128.0/20(-2.81), asn: 6327(-2.16), country: CA(-0.09)]; RCVD_IN_DNSWL_LOW(-0.10)[13.134.59.64.list.dnswl.org : 127.0.5.1] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2019 05:36:37 -0000 In message <201903120510.x2C5Afs9081736@repo.freebsd.org>, Warner Losh writes: > Author: imp > Date: Tue Mar 12 05:10:41 2019 > New Revision: 345052 > URL: https://svnweb.freebsd.org/changeset/base/345052 > > Log: > Fix botched merge with 355066 Should this be 335066? > > When merging from Netflix's tree, resetting the carsize was dropped > accidentally. This fix fixes that revision by properly resetting how > many are in the car. > > Noticed by: mav@ > > Modified: > head/sys/kern/subr_disk.c > > Modified: head/sys/kern/subr_disk.c > ============================================================================= > = > --- head/sys/kern/subr_disk.c Tue Mar 12 04:57:05 2019 (r345051) > +++ head/sys/kern/subr_disk.c Tue Mar 12 05:10:41 2019 (r345052) > @@ -201,6 +201,7 @@ bioq_insert_tail(struct bio_queue_head *head, struct b > > TAILQ_INSERT_TAIL(&head->queue, bp, bio_queue); > head->total++; > + head->batched = 0; > head->insert_point = bp; > head->last_offset = bp->bio_offset; > } > -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.