Skip to content

Commit f73e2d1

Browse files
author
Jens Axboe
committed
block: remove __generic_unplug_device() from exports
The only out-of-core user is IDE, and that should be using blk_start_queueing() instead. Signed-off-by: Jens Axboe <[email protected]>
1 parent 713ada9 commit f73e2d1

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

block/blk-core.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@ void __generic_unplug_device(struct request_queue *q)
257257

258258
q->request_fn(q);
259259
}
260-
EXPORT_SYMBOL(__generic_unplug_device);
261260

262261
/**
263262
* generic_unplug_device - fire a request queue

block/blk.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ void blk_unplug_timeout(unsigned long data);
2020
void blk_rq_timed_out_timer(unsigned long data);
2121
void blk_delete_timer(struct request *);
2222
void blk_add_timer(struct request *);
23+
void __generic_unplug_device(struct request_queue *);
2324

2425
/*
2526
* Internal atomic flags for request handling

drivers/ide/ide-io.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,8 +1493,8 @@ void ide_do_drive_cmd(ide_drive_t *drive, struct request *rq)
14931493

14941494
spin_lock_irqsave(&ide_lock, flags);
14951495
hwgroup->rq = NULL;
1496-
__elv_add_request(drive->queue, rq, ELEVATOR_INSERT_FRONT, 1);
1497-
__generic_unplug_device(drive->queue);
1496+
__elv_add_request(drive->queue, rq, ELEVATOR_INSERT_FRONT, 0);
1497+
blk_start_queueing(drive->queue);
14981498
spin_unlock_irqrestore(&ide_lock, flags);
14991499
}
15001500

include/linux/blkdev.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,6 @@ extern void blk_ordered_complete_seq(struct request_queue *, unsigned, int);
856856
extern int blk_rq_map_sg(struct request_queue *, struct request *, struct scatterlist *);
857857
extern void blk_dump_rq_flags(struct request *, char *);
858858
extern void generic_unplug_device(struct request_queue *);
859-
extern void __generic_unplug_device(struct request_queue *);
860859
extern long nr_blockdev_pages(void);
861860

862861
int blk_get_queue(struct request_queue *);

0 commit comments

Comments
 (0)