diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2014-11-10 17:21:13 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-11-10 09:27:39 -0700 |
| commit | 3b9d35d744bb5139f9fed57f38c019bb8c7d351c (patch) | |
| tree | 65217f616f9bc73515dfb6c18eb543c90b9ebdb0 /drivers/block/drbd | |
| parent | ff8bd88b73fad369a12465dfa52ad5c0bf088ced (diff) | |
| download | op-kernel-dev-3b9d35d744bb5139f9fed57f38c019bb8c7d351c.zip op-kernel-dev-3b9d35d744bb5139f9fed57f38c019bb8c7d351c.tar.gz | |
drbd: merge_bvec_fn: properly remap bvm->bi_bdev
This was not noticed for many years. Affects operation if
md raid is used a backing device for DRBD.
CC: stable@kernel.org # v3.2+
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/drbd')
| -rw-r--r-- | drivers/block/drbd/drbd_req.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 5a01c53..90319b1 100644 --- 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 *q, struct bvec_merge_data *bvm, struct 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); } |
