svn commit: r345052 - head/sys/kern

[Warner Losh]

On Mon, Mar 11, 2019 at 11:10 PM Warner Losh <imp at freebsd.org> 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;
>  }
>
>