diff options
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r-- | include/linux/blkdev.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index e1c7286165ff..ea330d7b46c0 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -342,7 +342,6 @@ typedef void (unplug_fn) (request_queue_t *); | |||
342 | 342 | ||
343 | struct bio_vec; | 343 | struct bio_vec; |
344 | typedef int (merge_bvec_fn) (request_queue_t *, struct bio *, struct bio_vec *); | 344 | typedef int (merge_bvec_fn) (request_queue_t *, struct bio *, struct bio_vec *); |
345 | typedef void (activity_fn) (void *data, int rw); | ||
346 | typedef int (issue_flush_fn) (request_queue_t *, struct gendisk *, sector_t *); | 345 | typedef int (issue_flush_fn) (request_queue_t *, struct gendisk *, sector_t *); |
347 | typedef void (prepare_flush_fn) (request_queue_t *, struct request *); | 346 | typedef void (prepare_flush_fn) (request_queue_t *, struct request *); |
348 | typedef void (softirq_done_fn)(struct request *); | 347 | typedef void (softirq_done_fn)(struct request *); |
@@ -384,7 +383,6 @@ struct request_queue | |||
384 | prep_rq_fn *prep_rq_fn; | 383 | prep_rq_fn *prep_rq_fn; |
385 | unplug_fn *unplug_fn; | 384 | unplug_fn *unplug_fn; |
386 | merge_bvec_fn *merge_bvec_fn; | 385 | merge_bvec_fn *merge_bvec_fn; |
387 | activity_fn *activity_fn; | ||
388 | issue_flush_fn *issue_flush_fn; | 386 | issue_flush_fn *issue_flush_fn; |
389 | prepare_flush_fn *prepare_flush_fn; | 387 | prepare_flush_fn *prepare_flush_fn; |
390 | softirq_done_fn *softirq_done_fn; | 388 | softirq_done_fn *softirq_done_fn; |
@@ -411,8 +409,6 @@ struct request_queue | |||
411 | */ | 409 | */ |
412 | void *queuedata; | 410 | void *queuedata; |
413 | 411 | ||
414 | void *activity_data; | ||
415 | |||
416 | /* | 412 | /* |
417 | * queue needs bounce pages for pages above this limit | 413 | * queue needs bounce pages for pages above this limit |
418 | */ | 414 | */ |
@@ -677,7 +673,6 @@ extern void blk_sync_queue(struct request_queue *q); | |||
677 | extern void __blk_stop_queue(request_queue_t *q); | 673 | extern void __blk_stop_queue(request_queue_t *q); |
678 | extern void blk_run_queue(request_queue_t *); | 674 | extern void blk_run_queue(request_queue_t *); |
679 | extern void blk_start_queueing(request_queue_t *); | 675 | extern void blk_start_queueing(request_queue_t *); |
680 | extern void blk_queue_activity_fn(request_queue_t *, activity_fn *, void *); | ||
681 | extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned long); | 676 | extern int blk_rq_map_user(request_queue_t *, struct request *, void __user *, unsigned long); |
682 | extern int blk_rq_unmap_user(struct request *); | 677 | extern int blk_rq_unmap_user(struct request *); |
683 | extern int blk_rq_map_kern(request_queue_t *, struct request *, void *, unsigned int, gfp_t); | 678 | extern int blk_rq_map_kern(request_queue_t *, struct request *, void *, unsigned int, gfp_t); |