block: remove generic_{start,end}_io_acct

Remove these now unused functions.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bio.c b/block/bio.c
index 9c101a0..3e89c7b 100644 (file)
--- a/block/bio.c
+++ b/block/bio.c
@@ -1392,45 +1392,6 @@ again:
        }
 }
 
-void generic_start_io_acct(struct request_queue *q, int op,
-                          unsigned long sectors, struct hd_struct *part)
-{
-       const int sgrp = op_stat_group(op);
-       int rw = op_is_write(op);
-
-       part_stat_lock();
-
-       update_io_ticks(part, jiffies, false);
-       part_stat_inc(part, ios[sgrp]);
-       part_stat_add(part, sectors[sgrp], sectors);
-       part_stat_local_inc(part, in_flight[rw]);
-       if (part->partno)
-               part_stat_local_inc(&part_to_disk(part)->part0, in_flight[rw]);
-
-       part_stat_unlock();
-}
-EXPORT_SYMBOL(generic_start_io_acct);
-
-void generic_end_io_acct(struct request_queue *q, int req_op,
-                        struct hd_struct *part, unsigned long start_time)
-{
-       unsigned long now = jiffies;
-       unsigned long duration = now - start_time;
-       const int sgrp = op_stat_group(req_op);
-       int rw = op_is_write(req_op);
-
-       part_stat_lock();
-
-       update_io_ticks(part, now, true);
-       part_stat_add(part, nsecs[sgrp], jiffies_to_nsecs(duration));
-       part_stat_local_dec(part, in_flight[rw]);
-       if (part->partno)
-               part_stat_local_dec(&part_to_disk(part)->part0, in_flight[rw]);
-
-       part_stat_unlock();
-}
-EXPORT_SYMBOL(generic_end_io_acct);
-
 static inline bool bio_remaining_done(struct bio *bio)
 {
        /*

diff --git a/include/linux/bio.h b/include/linux/bio.h
index 950c9dc..941378e 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -444,12 +444,6 @@ void bio_release_pages(struct bio *bio, bool mark_dirty);
 extern void bio_set_pages_dirty(struct bio *bio);
 extern void bio_check_pages_dirty(struct bio *bio);
 
-void generic_start_io_acct(struct request_queue *q, int op,
-                               unsigned long sectors, struct hd_struct *part);
-void generic_end_io_acct(struct request_queue *q, int op,
-                               struct hd_struct *part,
-                               unsigned long start_time);
-
 extern void bio_copy_data_iter(struct bio *dst, struct bvec_iter *dst_iter,
                               struct bio *src, struct bvec_iter *src_iter);
 extern void bio_copy_data(struct bio *dst, struct bio *src);