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 <jens.axboe@oracle.com>

diff --git a/block/blk-core.c b/block/blk-core.c
index fcbd56dd41fa60e5286d122fda3faefc29bbefca..81a496004976e9f406e5b44ca5fc72643fb87c25 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -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

diff --git a/block/blk.h b/block/blk.h
index e5c5797699636332640f7412d82b9f2cb5e07c83..d2e49af90db548ffa68e950bd800a48fdde79a1d 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -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

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 77c6eaeacefafaf987f0d7500eb82f394e189284..7162d67562af92e1679501a99a9fc09bce69e745 100644 (file)
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -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);
 }
 

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index a92d9e4ea96e1a0a5af66bf21c6dbf155674e418..8eed8b15f992b29128a13ff48b69f938eb7e89a3 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -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 *);