blk-core.c (da7878d75b8520c9ae00d27dfbbce546a7bfdfbb) blk-core.c (7ba1ba12eeef0aa7113beb16410ef8b7c748e18b)
1/*
2 * Copyright (C) 1991, 1992 Linus Torvalds
3 * Copyright (C) 1994, Karl Keyte: Added support for disk statistics
4 * Elevator latency, (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE
5 * Queue request tables / lock, selectable elevator, Jens Axboe <axboe@suse.de>
6 * kernel-doc documentation started by NeilBrown <neilb@cse.unsw.edu.au>
7 * - July2000
8 * bio rewrite, highmem i/o, etc, Jens Axboe <axboe@suse.de> - may 2001

--- 129 unchanged lines hidden (view full) ---

138 if (unlikely(nbytes > bio->bi_size)) {
139 printk(KERN_ERR "%s: want %u bytes done, %u left\n",
140 __func__, nbytes, bio->bi_size);
141 nbytes = bio->bi_size;
142 }
143
144 bio->bi_size -= nbytes;
145 bio->bi_sector += (nbytes >> 9);
1/*
2 * Copyright (C) 1991, 1992 Linus Torvalds
3 * Copyright (C) 1994, Karl Keyte: Added support for disk statistics
4 * Elevator latency, (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE
5 * Queue request tables / lock, selectable elevator, Jens Axboe <axboe@suse.de>
6 * kernel-doc documentation started by NeilBrown <neilb@cse.unsw.edu.au>
7 * - July2000
8 * bio rewrite, highmem i/o, etc, Jens Axboe <axboe@suse.de> - may 2001

--- 129 unchanged lines hidden (view full) ---

138 if (unlikely(nbytes > bio->bi_size)) {
139 printk(KERN_ERR "%s: want %u bytes done, %u left\n",
140 __func__, nbytes, bio->bi_size);
141 nbytes = bio->bi_size;
142 }
143
144 bio->bi_size -= nbytes;
145 bio->bi_sector += (nbytes >> 9);
146
147 if (bio_integrity(bio))
148 bio_integrity_advance(bio, nbytes);
149
146 if (bio->bi_size == 0)
147 bio_endio(bio, error);
148 } else {
149
150 /*
151 * Okay, this is the barrier request in progress, just
152 * record the error;
153 */

--- 1222 unchanged lines hidden (view full) ---

1376 goto end_io;
1377
1378 /*
1379 * If this device has partitions, remap block n
1380 * of partition p to block n+start(p) of the disk.
1381 */
1382 blk_partition_remap(bio);
1383
150 if (bio->bi_size == 0)
151 bio_endio(bio, error);
152 } else {
153
154 /*
155 * Okay, this is the barrier request in progress, just
156 * record the error;
157 */

--- 1222 unchanged lines hidden (view full) ---

1380 goto end_io;
1381
1382 /*
1383 * If this device has partitions, remap block n
1384 * of partition p to block n+start(p) of the disk.
1385 */
1386 blk_partition_remap(bio);
1387
1388 if (bio_integrity_enabled(bio) && bio_integrity_prep(bio))
1389 goto end_io;
1390
1384 if (old_sector != -1)
1385 blk_add_trace_remap(q, bio, old_dev, bio->bi_sector,
1386 old_sector);
1387
1388 blk_add_trace_bio(q, bio, BLK_TA_QUEUE);
1389
1390 old_sector = bio->bi_sector;
1391 old_dev = bio->bi_bdev->bd_dev;

--- 662 unchanged lines hidden --- 		1391 if (old_sector != -1)
1392 blk_add_trace_remap(q, bio, old_dev, bio->bi_sector,
1393 old_sector);
1394
1395 blk_add_trace_bio(q, bio, BLK_TA_QUEUE);
1396
1397 old_sector = bio->bi_sector;
1398 old_dev = bio->bi_bdev->bd_dev;

--- 662 unchanged lines hidden ---