/* Common code for the make_request functions */
+static inline void bch_bio_start_io_acct(struct gendisk *acct_bi_disk,
+ struct bio *bio,
+ unsigned long *start_time)
+{
+ struct gendisk *saved_bi_disk = bio->bi_disk;
+
+ bio->bi_disk = acct_bi_disk;
+ *start_time = bio_start_io_acct(bio);
+ bio->bi_disk = saved_bi_disk;
+}
+
+static inline void bch_bio_end_io_acct(struct gendisk *acct_bi_disk,
+ struct bio *bio,
+ unsigned long start_time)
+{
+ struct gendisk *saved_bi_disk = bio->bi_disk;
+
+ bio->bi_disk = acct_bi_disk;
+ bio_end_io_acct(bio, start_time);
+ bio->bi_disk = saved_bi_disk;
+}
+
static void request_endio(struct bio *bio)
{
struct closure *cl = bio->bi_private;
static void bio_complete(struct search *s)
{
if (s->orig_bio) {
- bio_end_io_acct(s->orig_bio, s->start_time);
+ bch_bio_end_io_acct(s->d->disk, s->orig_bio, s->start_time);
trace_bcache_request_end(s->d, s->orig_bio);
s->orig_bio->bi_status = s->iop.status;
bio_endio(s->orig_bio);
s->recoverable = 1;
s->write = op_is_write(bio_op(bio));
s->read_dirty_data = 0;
- s->start_time = bio_start_io_acct(bio);
+ bch_bio_start_io_acct(d->disk, bio, &s->start_time);
s->iop.c = d->c;
s->iop.bio = NULL;
bio->bi_end_io = ddip->bi_end_io;
bio->bi_private = ddip->bi_private;
- bio_end_io_acct(bio, ddip->start_time);
+ bch_bio_end_io_acct(ddip->d->disk, bio, ddip->start_time);
if (bio->bi_status) {
struct cached_dev *dc = container_of(ddip->d,
*/
ddip = kzalloc(sizeof(struct detached_dev_io_private), GFP_NOIO);
ddip->d = d;
- ddip->start_time = bio_start_io_acct(bio);
+ bch_bio_start_io_acct(d->disk, bio, &ddip->start_time);
+
ddip->bi_end_io = bio->bi_end_io;
ddip->bi_private = bio->bi_private;
bio->bi_end_io = detached_dev_end_io;