aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/bio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/bio.c b/fs/bio.c
index d59ddbf79626..242e409dab4b 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -248,11 +248,13 @@ inline int bio_hw_segments(struct request_queue *q, struct bio *bio)
248 */ 248 */
249void __bio_clone(struct bio *bio, struct bio *bio_src) 249void __bio_clone(struct bio *bio, struct bio *bio_src)
250{ 250{
251 struct request_queue *q = bdev_get_queue(bio_src->bi_bdev);
252
253 memcpy(bio->bi_io_vec, bio_src->bi_io_vec, 251 memcpy(bio->bi_io_vec, bio_src->bi_io_vec,
254 bio_src->bi_max_vecs * sizeof(struct bio_vec)); 252 bio_src->bi_max_vecs * sizeof(struct bio_vec));
255 253
254 /*
255 * most users will be overriding ->bi_bdev with a new target,
256 * so we don't set nor calculate new physical/hw segment counts here
257 */
256 bio->bi_sector = bio_src->bi_sector; 258 bio->bi_sector = bio_src->bi_sector;
257 bio->bi_bdev = bio_src->bi_bdev; 259 bio->bi_bdev = bio_src->bi_bdev;
258 bio->bi_flags |= 1 << BIO_CLONED; 260 bio->bi_flags |= 1 << BIO_CLONED;
@@ -260,8 +262,6 @@ void __bio_clone(struct bio *bio, struct bio *bio_src)
260 bio->bi_vcnt = bio_src->bi_vcnt; 262 bio->bi_vcnt = bio_src->bi_vcnt;
261 bio->bi_size = bio_src->bi_size; 263 bio->bi_size = bio_src->bi_size;
262 bio->bi_idx = bio_src->bi_idx; 264 bio->bi_idx = bio_src->bi_idx;
263 bio_phys_segments(q, bio);
264 bio_hw_segments(q, bio);
265} 265}
266 266
267/** 267/**