* FAILED: patch "[PATCH] block: get the 1st and last bvec via helpers" failed to apply to 4.4-stable tree
@ 2016-03-05 19:22 gregkh
2016-03-06 1:26 ` Ming Lei
0 siblings, 1 reply; 6+ messages in thread
From: gregkh @ 2016-03-05 19:22 UTC (permalink / raw)
To: ming.lei, axboe, hch, sagig, sagig; +Cc: stable
The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 25e71a99f10e444cd00bb2ebccb11e1c9fb672b1 Mon Sep 17 00:00:00 2001
From: Ming Lei <ming.lei@canonical.com>
Date: Fri, 26 Feb 2016 23:40:52 +0800
Subject: [PATCH] block: get the 1st and last bvec via helpers
This patch applies the two introduced helpers to
figure out the 1st and last bvec, and fixes the
original way after bio splitting.
Cc: stable@vger.kernel.org
Reported-by: Sagi Grimberg <sagig@dev.mellanox.co.il>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index cd06a41581b3..d7f6bca707ef 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1394,11 +1394,16 @@ static inline bool bvec_gap_to_prev(struct request_queue *q,
static inline bool bio_will_gap(struct request_queue *q, struct bio *prev,
struct bio *next)
{
- if (!bio_has_data(prev) || !queue_virt_boundary(q))
- return false;
+ if (bio_has_data(prev) && queue_virt_boundary(q)) {
+ struct bio_vec pb, nb;
+
+ bio_get_last_bvec(prev, &pb);
+ bio_get_first_bvec(next, &nb);
- return __bvec_gap_to_prev(q, &prev->bi_io_vec[prev->bi_vcnt - 1],
- next->bi_io_vec[0].bv_offset);
+ return __bvec_gap_to_prev(q, &pb, nb.bv_offset);
+ }
+
+ return false;
}
static inline bool req_gap_back_merge(struct request *req, struct bio *bio)
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: FAILED: patch "[PATCH] block: get the 1st and last bvec via helpers" failed to apply to 4.4-stable tree
2016-03-05 19:22 FAILED: patch "[PATCH] block: get the 1st and last bvec via helpers" failed to apply to 4.4-stable tree gregkh
@ 2016-03-06 1:26 ` Ming Lei
2016-03-06 3:00 ` Greg Kroah-Hartman
2016-03-07 23:02 ` Greg Kroah-Hartman
0 siblings, 2 replies; 6+ messages in thread
From: Ming Lei @ 2016-03-06 1:26 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Jens Axboe, Christoph Hellwig, Sagi Grimberg, sagig, stable
On Sun, Mar 6, 2016 at 3:22 AM, <gregkh@linuxfoundation.org> wrote:
>
> The patch below does not apply to the 4.4-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
The simplest way is to apply commit 0e8bd6fdfb2b96eb(block: check virt
boundary in bio_will_gap()) before this patch.
Thanks,
Ming
>
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From 25e71a99f10e444cd00bb2ebccb11e1c9fb672b1 Mon Sep 17 00:00:00 2001
> From: Ming Lei <ming.lei@canonical.com>
> Date: Fri, 26 Feb 2016 23:40:52 +0800
> Subject: [PATCH] block: get the 1st and last bvec via helpers
>
> This patch applies the two introduced helpers to
> figure out the 1st and last bvec, and fixes the
> original way after bio splitting.
>
> Cc: stable@vger.kernel.org
> Reported-by: Sagi Grimberg <sagig@dev.mellanox.co.il>
> Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> Signed-off-by: Ming Lei <ming.lei@canonical.com>
> Signed-off-by: Jens Axboe <axboe@fb.com>
>
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index cd06a41581b3..d7f6bca707ef 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -1394,11 +1394,16 @@ static inline bool bvec_gap_to_prev(struct request_queue *q,
> static inline bool bio_will_gap(struct request_queue *q, struct bio *prev,
> struct bio *next)
> {
> - if (!bio_has_data(prev) || !queue_virt_boundary(q))
> - return false;
> + if (bio_has_data(prev) && queue_virt_boundary(q)) {
> + struct bio_vec pb, nb;
> +
> + bio_get_last_bvec(prev, &pb);
> + bio_get_first_bvec(next, &nb);
>
> - return __bvec_gap_to_prev(q, &prev->bi_io_vec[prev->bi_vcnt - 1],
> - next->bi_io_vec[0].bv_offset);
> + return __bvec_gap_to_prev(q, &pb, nb.bv_offset);
> + }
> +
> + return false;
> }
>
> static inline bool req_gap_back_merge(struct request *req, struct bio *bio)
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: FAILED: patch "[PATCH] block: get the 1st and last bvec via helpers" failed to apply to 4.4-stable tree
2016-03-06 1:26 ` Ming Lei
@ 2016-03-06 3:00 ` Greg Kroah-Hartman
2016-03-06 9:50 ` Ming Lei
2016-03-07 23:02 ` Greg Kroah-Hartman
1 sibling, 1 reply; 6+ messages in thread
From: Greg Kroah-Hartman @ 2016-03-06 3:00 UTC (permalink / raw)
To: Ming Lei; +Cc: Jens Axboe, Christoph Hellwig, Sagi Grimberg, sagig, stable
On Sun, Mar 06, 2016 at 09:26:59AM +0800, Ming Lei wrote:
> On Sun, Mar 6, 2016 at 3:22 AM, <gregkh@linuxfoundation.org> wrote:
> >
> > The patch below does not apply to the 4.4-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
>
> The simplest way is to apply commit 0e8bd6fdfb2b96eb(block: check virt
> boundary in bio_will_gap()) before this patch.
Will that fix the build errors here? It applies fine, but the build
breaks. I'll try it out on Monday...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: FAILED: patch "[PATCH] block: get the 1st and last bvec via helpers" failed to apply to 4.4-stable tree
2016-03-06 3:00 ` Greg Kroah-Hartman
@ 2016-03-06 9:50 ` Ming Lei
0 siblings, 0 replies; 6+ messages in thread
From: Ming Lei @ 2016-03-06 9:50 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Jens Axboe, Christoph Hellwig, Sagi Grimberg, sagig, stable
On Sun, Mar 6, 2016 at 11:00 AM, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
> On Sun, Mar 06, 2016 at 09:26:59AM +0800, Ming Lei wrote:
>> On Sun, Mar 6, 2016 at 3:22 AM, <gregkh@linuxfoundation.org> wrote:
>> >
>> > The patch below does not apply to the 4.4-stable tree.
>> > If someone wants it applied there, or to any other stable or longterm
>> > tree, then please email the backport, including the original git commit
>> > id to <stable@vger.kernel.org>.
>>
>> The simplest way is to apply commit 0e8bd6fdfb2b96eb(block: check virt
>> boundary in bio_will_gap()) before this patch.
>
> Will that fix the build errors here? It applies fine, but the build
> breaks. I'll try it out on Monday...
This patch depends on commit 0e8bd6fd, but it shouldn't have caused
any build error.
If you may provide the error log, I'd like to take a look.
Thanks,
Ming
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: FAILED: patch "[PATCH] block: get the 1st and last bvec via helpers" failed to apply to 4.4-stable tree
2016-03-06 1:26 ` Ming Lei
2016-03-06 3:00 ` Greg Kroah-Hartman
@ 2016-03-07 23:02 ` Greg Kroah-Hartman
2016-03-07 23:16 ` Greg Kroah-Hartman
1 sibling, 1 reply; 6+ messages in thread
From: Greg Kroah-Hartman @ 2016-03-07 23:02 UTC (permalink / raw)
To: Ming Lei; +Cc: Jens Axboe, Christoph Hellwig, Sagi Grimberg, sagig, stable
On Sun, Mar 06, 2016 at 09:26:59AM +0800, Ming Lei wrote:
> On Sun, Mar 6, 2016 at 3:22 AM, <gregkh@linuxfoundation.org> wrote:
> >
> > The patch below does not apply to the 4.4-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
>
> The simplest way is to apply commit 0e8bd6fdfb2b96eb(block: check virt
> boundary in bio_will_gap()) before this patch.
You mean e0af29171aa8912e1ca95023b75ef336cd70d661, right?
0e8bd6fdfb2b96eb is a tree commit...
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: FAILED: patch "[PATCH] block: get the 1st and last bvec via helpers" failed to apply to 4.4-stable tree
2016-03-07 23:02 ` Greg Kroah-Hartman
@ 2016-03-07 23:16 ` Greg Kroah-Hartman
0 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2016-03-07 23:16 UTC (permalink / raw)
To: Ming Lei; +Cc: Jens Axboe, Christoph Hellwig, Sagi Grimberg, sagig, stable
On Mon, Mar 07, 2016 at 03:02:06PM -0800, Greg Kroah-Hartman wrote:
> On Sun, Mar 06, 2016 at 09:26:59AM +0800, Ming Lei wrote:
> > On Sun, Mar 6, 2016 at 3:22 AM, <gregkh@linuxfoundation.org> wrote:
> > >
> > > The patch below does not apply to the 4.4-stable tree.
> > > If someone wants it applied there, or to any other stable or longterm
> > > tree, then please email the backport, including the original git commit
> > > id to <stable@vger.kernel.org>.
> >
> > The simplest way is to apply commit 0e8bd6fdfb2b96eb(block: check virt
> > boundary in bio_will_gap()) before this patch.
>
> You mean e0af29171aa8912e1ca95023b75ef336cd70d661, right?
> 0e8bd6fdfb2b96eb is a tree commit...
Ok, that all worked properly, thanks for the info.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-03-07 23:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-05 19:22 FAILED: patch "[PATCH] block: get the 1st and last bvec via helpers" failed to apply to 4.4-stable tree gregkh
2016-03-06 1:26 ` Ming Lei
2016-03-06 3:00 ` Greg Kroah-Hartman
2016-03-06 9:50 ` Ming Lei
2016-03-07 23:02 ` Greg Kroah-Hartman
2016-03-07 23:16 ` Greg Kroah-Hartman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.