Re: [PATCH] drbd: merge_bvec_fn: properly remap bvm->bi_bdev

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Jan 14, 2015 at 05:47:12PM +0100, Philipp Reisner wrote:
> From: Lars Ellenberg <lars.ellenberg@xxxxxxxxxx>
> 
> This was not noticed for many years. Affects operation if
> md raid is used a backing device for DRBD.
> 
> In upstream this is commit 3b9d35d744bb5139f9fed57f38c019bb8c7d351c
> 
> CC: stable@xxxxxxxxxx # v3.2+
> Signed-off-by: Philipp Reisner <philipp.reisner@xxxxxxxxxx>
> Signed-off-by: Lars Ellenberg <lars.ellenberg@xxxxxxxxxx>
> Signed-off-by: Jens Axboe <axboe@xxxxxx>
> ---
>  drivers/block/drbd/drbd_req.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
> index c24379f..3dd26a2 100644
> --- a/drivers/block/drbd/drbd_req.c
> +++ b/drivers/block/drbd/drbd_req.c
> @@ -1309,6 +1309,7 @@ int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct
>  		struct request_queue * const b =
>  			mdev->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);
>  		}

This breaks the build on 3.14, so I'm guessing it's only for 3.10?  Can
you provide a version for 3.14-stable as well?

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]