[PATCH 3.18 091/150] drbd: merge_bvec_fn: properly remap bvm->bi_bdev
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2015-01-14 07:31:04
Also in:
lkml
3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lars Ellenberg <lars.ellenberg@linbit.com> commit 3b9d35d744bb5139f9fed57f38c019bb8c7d351c upstream. This was not noticed for many years. Affects operation if md raid is used a backing device for DRBD. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com> Signed-off-by: Jens Axboe <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/block/drbd/drbd_req.c | 1 + 1 file changed, 1 insertion(+)
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c@@ -1545,6 +1545,7 @@ int drbd_merge_bvec(struct request_queue struct request_queue * const b = device->ldev->backing_bdev->bd_disk->queue; if (b->merge_bvec_fn) { + bvm->bi_bdev = device->ldev->backing_bdev; backing_limit = b->merge_bvec_fn(b, bvm, bvec); limit = min(limit, backing_limit); }