diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 13:03:24 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 13:03:24 -0400 |
| commit | 8973a585aec125beb2a3de50bb491004299f53d5 (patch) | |
| tree | 3f069a9c7eff2c916e02427fd9800ce2b55a4a90 /drivers/md/linear.c | |
| parent | 907f4678c114a125fe4584758681c31bf3d627da (diff) | |
| parent | bef9c558841604116704e10b3d9ff3dbf4939423 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'drivers/md/linear.c')
| -rw-r--r-- | drivers/md/linear.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c index 161e9aa87291..b1941b887f46 100644 --- a/drivers/md/linear.c +++ b/drivers/md/linear.c | |||
| @@ -269,9 +269,8 @@ static int linear_make_request (request_queue_t *q, struct bio *bio) | |||
| 269 | * split it. | 269 | * split it. |
| 270 | */ | 270 | */ |
| 271 | struct bio_pair *bp; | 271 | struct bio_pair *bp; |
| 272 | bp = bio_split(bio, bio_split_pool, | 272 | bp = bio_split(bio, bio_split_pool, |
| 273 | (bio->bi_sector + (bio->bi_size >> 9) - | 273 | ((tmp_dev->offset + tmp_dev->size)<<1) - bio->bi_sector); |
| 274 | (tmp_dev->offset + tmp_dev->size))<<1); | ||
| 275 | if (linear_make_request(q, &bp->bio1)) | 274 | if (linear_make_request(q, &bp->bio1)) |
| 276 | generic_make_request(&bp->bio1); | 275 | generic_make_request(&bp->bio1); |
| 277 | if (linear_make_request(q, &bp->bio2)) | 276 | if (linear_make_request(q, &bp->bio2)) |