From 14b79c64b7cbd966a6116332977426b631326b0a Mon Sep 17 00:00:00 2001 From: Alasdair G Kergon Date: Fri, 27 Jul 2012 15:07:59 +0100 Subject: [PATCH] --- yaml --- r: 319458 b: refs/heads/master c: 70c48611024791ccf83aca6195b58a5db9325485 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-snap.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 95442fd2d507..93f46921805e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c971178a788c70e8d6db5c3a813de1a1f54e5b7 +refs/heads/master: 70c48611024791ccf83aca6195b58a5db9325485 diff --git a/trunk/drivers/md/dm-snap.c b/trunk/drivers/md/dm-snap.c index 6f758870fc19..a228c20e40b3 100644 --- a/trunk/drivers/md/dm-snap.c +++ b/trunk/drivers/md/dm-snap.c @@ -2176,7 +2176,6 @@ static int origin_merge(struct dm_target *ti, struct bvec_merge_data *bvm, return max_size; bvm->bi_bdev = dev->bdev; - bvm->bi_sector = bvm->bi_sector; return min(max_size, q->merge_bvec_fn(q, bvm, biovec)); }