diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-15 05:10:00 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-15 05:10:00 +0200 |
commit | 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (patch) | |
tree | 07aea7539f78f221c6fc535a94a07befa2afdb63 /fs/bio.c | |
parent | [PATCH] ieee80211: Fix frame control pver mask (diff) | |
parent | Revert PCIBIOS_MIN_IO changes for 2.6.13 (diff) | |
download | linux-4c0e176dd5e4c44dd60f398518f75eedbe1a65f3.tar.xz linux-4c0e176dd5e4c44dd60f398518f75eedbe1a65f3.zip |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/bio.c')
-rw-r--r-- | fs/bio.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -248,17 +248,13 @@ inline void __bio_clone(struct bio *bio, struct bio *bio_src) { request_queue_t *q = bdev_get_queue(bio_src->bi_bdev); - memcpy(bio->bi_io_vec, bio_src->bi_io_vec, bio_src->bi_max_vecs * sizeof(struct bio_vec)); + memcpy(bio->bi_io_vec, bio_src->bi_io_vec, + bio_src->bi_max_vecs * sizeof(struct bio_vec)); bio->bi_sector = bio_src->bi_sector; bio->bi_bdev = bio_src->bi_bdev; bio->bi_flags |= 1 << BIO_CLONED; bio->bi_rw = bio_src->bi_rw; - - /* - * notes -- maybe just leave bi_idx alone. assume identical mapping - * for the clone - */ bio->bi_vcnt = bio_src->bi_vcnt; bio->bi_size = bio_src->bi_size; bio->bi_idx = bio_src->bi_idx; |