block: remove per-queue plugging

[mirror_ubuntu-artful-kernel.git] / drivers / block / cciss.c

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 516d5bbec2b6fc5c78884a1d58c44ae4fc0b73f6..35658f445fca4a494071438ad0f4788bab936231 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -2833,7 +2833,7 @@ static int cciss_revalidate(struct gendisk *disk)
        sector_t total_size;
        InquiryData_struct *inq_buff = NULL;
 
-       for (logvol = 0; logvol < CISS_MAX_LUN; logvol++) {
+       for (logvol = 0; logvol <= h->highest_lun; logvol++) {
                if (!h->drv[logvol])
                        continue;
                if (memcmp(h->drv[logvol]->LunID, drv->LunID,
@@ -3170,12 +3170,6 @@ static void do_cciss_request(struct request_queue *q)
        int sg_index = 0;
        int chained = 0;
 
-       /* We call start_io here in case there is a command waiting on the
-        * queue that has not been sent.
-        */
-       if (blk_queue_plugged(q))
-               goto startio;
-
       queue:
        creq = blk_peek_request(q);
        if (!creq)