aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/message')
-rw-r--r--drivers/message/i2o/i2o_block.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 8b5cbfc3ba97..6573ef4408f1 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -877,7 +877,7 @@ static void i2o_block_request_fn(struct request_queue *q)
877 struct request *req; 877 struct request *req;
878 878
879 while (!blk_queue_plugged(q)) { 879 while (!blk_queue_plugged(q)) {
880 req = elv_next_request(q); 880 req = blk_peek_request(q);
881 if (!req) 881 if (!req)
882 break; 882 break;
883 883
@@ -890,7 +890,7 @@ static void i2o_block_request_fn(struct request_queue *q)
890 890
891 if (queue_depth < I2O_BLOCK_MAX_OPEN_REQUESTS) { 891 if (queue_depth < I2O_BLOCK_MAX_OPEN_REQUESTS) {
892 if (!i2o_block_transfer(req)) { 892 if (!i2o_block_transfer(req)) {
893 blkdev_dequeue_request(req); 893 blk_start_request(req);
894 continue; 894 continue;
895 } else 895 } else
896 osm_info("transfer error\n"); 896 osm_info("transfer error\n");
@@ -917,7 +917,7 @@ static void i2o_block_request_fn(struct request_queue *q)
917 break; 917 break;
918 } 918 }
919 } else { 919 } else {
920 blkdev_dequeue_request(req); 920 blk_start_request(req);
921 __blk_end_request_all(req, -EIO); 921 __blk_end_request_all(req, -EIO);
922 } 922 }
923 } 923 }