Commit f73e2d13 authored by Jens Axboe's avatar Jens Axboe
Browse files

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: default avatarJens Axboe <jens.axboe@oracle.com>
parent 713ada9b

block/blk-core.c

+0 −1
Original line number Diff line number Diff line
@@ -257,7 +257,6 @@ void __generic_unplug_device(struct request_queue *q) 


	q->request_fn(q);

}

EXPORT_SYMBOL(__generic_unplug_device);



/**

 * generic_unplug_device - fire a request queue

block/blk.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ void blk_unplug_timeout(unsigned long data); 
void blk_rq_timed_out_timer(unsigned long data);

void blk_delete_timer(struct request *);

void blk_add_timer(struct request *);

void __generic_unplug_device(struct request_queue *);



/*

 * Internal atomic flags for request handling

drivers/ide/ide-io.c

+2 −2
Original line number Diff line number Diff line
@@ -1493,8 +1493,8 @@ void ide_do_drive_cmd(ide_drive_t *drive, struct request *rq) 


	spin_lock_irqsave(&ide_lock, flags);

	hwgroup->rq = NULL;

	__elv_add_request(drive->queue, rq, ELEVATOR_INSERT_FRONT, 1);

	__generic_unplug_device(drive->queue);

	__elv_add_request(drive->queue, rq, ELEVATOR_INSERT_FRONT, 0);

	blk_start_queueing(drive->queue);

	spin_unlock_irqrestore(&ide_lock, flags);

}

include/linux/blkdev.h

+0 −1
Original line number Diff line number Diff line
@@ -856,7 +856,6 @@ extern void blk_ordered_complete_seq(struct request_queue *, unsigned, int); 
extern int blk_rq_map_sg(struct request_queue *, struct request *, struct scatterlist *);

extern void blk_dump_rq_flags(struct request *, char *);

extern void generic_unplug_device(struct request_queue *);

extern void __generic_unplug_device(struct request_queue *);

extern long nr_blockdev_pages(void);



int blk_get_queue(struct request_queue *);