History

block: remove __generic_unplug_device() from exports

The only out-of-core user is IDE, and that should be using blk_start_queueing() instead.

Jens Axboe committed 18 years ago

Commit f73e2d11 parent 713ada94 files · +3 −4Browse files

Unified · Split

4 files
  1. block/blk-core.c +0 −1
  2. block/blk.h +1 −0
  3. drivers/ide/ide-io.c +2 −2
  4. include/linux/blkdev.h +0 −1
block/blk-core.c+0−1
@@ -257,7 +257,6 @@ void __generic_unplug_device(struct request_queue *q) · 256 unmodified lines
257 257
258 q->request_fn(q);258 q->request_fn(q);
259}259}
260EXPORT_SYMBOL(__generic_unplug_device);
261 260
262/**261/**
263 * generic_unplug_device - fire a request queue262 * generic_unplug_device - fire a request queue
block/blk.h+1−0
@@ -20,6 +20,7 @@ void blk_unplug_timeout(unsigned long data); · 19 unmodified lines
20void blk_rq_timed_out_timer(unsigned long data);20void blk_rq_timed_out_timer(unsigned long data);
21void blk_delete_timer(struct request *);21void blk_delete_timer(struct request *);
22void blk_add_timer(struct request *);22void blk_add_timer(struct request *);
23void __generic_unplug_device(struct request_queue *);
23 24
24/*25/*
25 * Internal atomic flags for request handling26 * Internal atomic flags for request handling
drivers/ide/ide-io.c+2−2
@@ -1493,8 +1493,8 @@ void ide_do_drive_cmd(ide_drive_t *drive, struct request *rq) · 1492 unmodified lines
1493 1493
1494 spin_lock_irqsave(&ide_lock, flags);1494 spin_lock_irqsave(&ide_lock, flags);
1495 hwgroup->rq = NULL;1495 hwgroup->rq = NULL;
1496 __elv_add_request(drive->queue, rq, ELEVATOR_INSERT_FRONT, 1);1496 __elv_add_request(drive->queue, rq, ELEVATOR_INSERT_FRONT, 0);
1497 __generic_unplug_device(drive->queue);1497 blk_start_queueing(drive->queue);
1498 spin_unlock_irqrestore(&ide_lock, flags);1498 spin_unlock_irqrestore(&ide_lock, flags);
1499}1499}
1500 1500
include/linux/blkdev.h+0−1
@@ -856,7 +856,6 @@ extern void blk_ordered_complete_seq(struct request_queue *, unsigned, int); · 855 unmodified lines
856extern int blk_rq_map_sg(struct request_queue *, struct request *, struct scatterlist *);856extern int blk_rq_map_sg(struct request_queue *, struct request *, struct scatterlist *);
857extern void blk_dump_rq_flags(struct request *, char *);857extern void blk_dump_rq_flags(struct request *, char *);
858extern void generic_unplug_device(struct request_queue *);858extern void generic_unplug_device(struct request_queue *);
859extern void __generic_unplug_device(struct request_queue *);
860extern long nr_blockdev_pages(void);859extern long nr_blockdev_pages(void);
861 860
862int blk_get_queue(struct request_queue *);861int blk_get_queue(struct request_queue *);