From owner-svn-src-head@freebsd.org Tue Mar 12 05:17:50 2019 Return-Path: Delivered-To: svn-src-head@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 865741544EDE for ; Tue, 12 Mar 2019 05:17:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 10F8C748CE for ; Tue, 12 Mar 2019 05:17:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x833.google.com with SMTP id v10so1207105qtp.8 for ; Mon, 11 Mar 2019 22:17:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=1FJ7Qxfxa3VH748fV7kHno4Js7xGgHhqSpwSQMRizHI=; b=X+HXxA4x9rv2KcP4yrINHSk3hiIM/bpMR9P0pe0efeHUmHwbYX4DkS7xIII2sEq92j c83O3FIJPFhUVek6jzgmkOqiWQs9fVEage7WiJtVzUrVJxPQk2En07V5ENvazDjo/UuM ZanfESWZrlfFd8tqBn0Kdic2NmusxPVgprBqAGdn4AcghbDzVeG04rd7nvnJfSirUoGi 9eKUGXqIXiASErZiiJoWpzFZPks99dDEFjDtIpYAvqlYl59Om1TTx6MXCgsr5+ljlcG9 NcT1iJ2h4sbXEMf03Chw/wQqd6w38NgcCtpEWd7E7wkSe+zjBBkPvsxe4izzemFUmfxu SMsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=1FJ7Qxfxa3VH748fV7kHno4Js7xGgHhqSpwSQMRizHI=; b=cSF6Wda1Vu3jSAFgtumRLw0lwJvPiIm//EYqdwQFTECH4eS0He5xgT6Q2Y/1JPlTDN tBP8VGk9yE97nn5BqrxO3kUAI+41GRVY0iDOldCM4tv3sHnsjzHl8qZWvJVltrFG9H47 2pvj8tC2KEOdGYb2IMP26/nIAnNpu5Kq0wKxDLzmDw3KFnQi5wWMmaf06cW9fNcuVQbr PXiBQv5vzxcyVMJH8GS6BEji8DHlpTfR3Q/1u614KdfJIdC0fNxRm9UhM+O7ZUrRqs23 lMyiGffz+8hiqgkoGrRLSGMlEpmgtS0KiM7GX7EvCVirp0i9UssEXrOK19c5c2H62WIK 3aMw== X-Gm-Message-State: APjAAAVEwE9dW9jizlC9EsOaZ7rdg6vWHWMtX0toh+qpyFNeIPQWF+Bv LiJoh8Hn4WQi2Ixo2TPYfFJyiSccLZGuWOWKwbaL8Q== X-Google-Smtp-Source: APXvYqw9/WmSgX4wK0QNfwcHuEyT3eysukcerRhduLe0lOBf3tYpQl18r3EPe8ruyh0DQb8/ghJA8RU0wb7G4a8BO9E= X-Received: by 2002:ac8:3616:: with SMTP id m22mr17043595qtb.15.1552367869177; Mon, 11 Mar 2019 22:17:49 -0700 (PDT) MIME-Version: 1.0 References: <201903120510.x2C5Afs9081736@repo.freebsd.org> In-Reply-To: <201903120510.x2C5Afs9081736@repo.freebsd.org> From: Warner Losh Date: Mon, 11 Mar 2019 23:17:37 -0600 Message-ID: Subject: Re: svn commit: r345052 - head/sys/kern To: Warner Losh Cc: src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 10F8C748CE X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.97)[-0.966,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 12 Mar 2019 05:17:50 -0000 On Mon, Mar 11, 2019 at 11:10 PM Warner Losh wrote: > 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 > It was actually 335066. And since this was before the 12 branch, it should be MFC'd in a week or so. Warner > 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; > } > >