---

yaml --- r: 115491 b: refs/heads/master c: f73e2d1 h: refs/heads/master i: 115489: 171ace8 115487: 40e6642 v: v3
git-mirror · Oct 17, 2008 · d996b07 · d996b07
1 parent ef66d3c
commit d996b07
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 713ada9ba94f2ad874cffd074b83e3dc681ca82f
+refs/heads/master: f73e2d13a16cc88c4faa4729967f92bfeec8a142
diff --git a/trunk/block/blk-core.c b/trunk/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/trunk/block/blk.h b/trunk/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/trunk/drivers/ide/ide-io.c b/trunk/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/trunk/include/linux/blkdev.h b/trunk/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 *);
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@