1 files changed, 36 insertions, 28 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 71da5111120c..9fe174dc74d1 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1147,7 +1147,7 @@ void init_request_from_bio(struct request *req, struct bio *bio)
  */
 static inline bool queue_should_plug(struct request_queue *q)
 {
-        return !(blk_queue_nonrot(q) && blk_queue_queuing(q));
+        return !(blk_queue_nonrot(q) && blk_queue_tagged(q));
 }
 
 static int __make_request(struct request_queue *q, struct bio *bio)
@@ -1490,9 +1490,9 @@ end_io:
 /*
  * We only want one ->make_request_fn to be active at a time,
  * else stack usage with stacked devices could be a problem.
- * So use current->bio_{list,tail} to keep a list of requests
+ * So use current->bio_list to keep a list of requests
  * submited by a make_request_fn function.
- * current->bio_tail is also used as a flag to say if
+ * current->bio_list is also used as a flag to say if
  * generic_make_request is currently active in this task or not.
  * If it is NULL, then no make_request is active.  If it is non-NULL,
  * then a make_request is active, and new requests should be added
@@ -1500,11 +1500,11 @@ end_io:
  */
 void generic_make_request(struct bio *bio)
 {
-        if (current->bio_tail) {
+        struct bio_list bio_list_on_stack;
+
+        if (current->bio_list) {
                 /* make_request is active */
-                *(current->bio_tail) = bio;
-                bio->bi_next = NULL;
-                current->bio_tail = &bio->bi_next;
+                bio_list_add(current->bio_list, bio);
                 return;
         }
         /* following loop may be a bit non-obvious, and so deserves some
@@ -1512,30 +1512,27 @@ void generic_make_request(struct bio *bio)
          * Before entering the loop, bio->bi_next is NULL (as all callers
          * ensure that) so we have a list with a single bio.
          * We pretend that we have just taken it off a longer list, so
-         * we assign bio_list to the next (which is NULL) and bio_tail
-         * to &bio_list, thus initialising the bio_list of new bios to be
+         * we assign bio_list to a pointer to the bio_list_on_stack,
+         * thus initialising the bio_list of new bios to be
          * added.  __generic_make_request may indeed add some more bios
          * through a recursive call to generic_make_request.  If it
          * did, we find a non-NULL value in bio_list and re-enter the loop
          * from the top.  In this case we really did just take the bio
-         * of the top of the list (no pretending) and so fixup bio_list and
-         * bio_tail or bi_next, and call into __generic_make_request again.
+         * of the top of the list (no pretending) and so remove it from
+         * bio_list, and call into __generic_make_request again.
          *
          * The loop was structured like this to make only one call to
          * __generic_make_request (which is important as it is large and
          * inlined) and to keep the structure simple.
          */
         BUG_ON(bio->bi_next);
+        bio_list_init(&bio_list_on_stack);
+        current->bio_list = &bio_list_on_stack;
         do {
-                current->bio_list = bio->bi_next;
-                if (bio->bi_next == NULL)
-                        current->bio_tail = &current->bio_list;
-                else
-                        bio->bi_next = NULL;
                 __generic_make_request(bio);
-                bio = current->bio_list;
+                bio = bio_list_pop(current->bio_list);
         } while (bio);
-        current->bio_tail = NULL; /* deactivate */
+        current->bio_list = NULL; /* deactivate */
 }
 EXPORT_SYMBOL(generic_make_request);
 
@@ -1617,8 +1614,7 @@ int blk_rq_check_limits(struct request_queue *q, struct request *rq)
          * limitation.
          */
         blk_recalc_rq_segments(rq);
-        if (rq->nr_phys_segments > queue_max_phys_segments(q) ||
-            rq->nr_phys_segments > queue_max_hw_segments(q)) {
+        if (rq->nr_phys_segments > queue_max_segments(q)) {
                 printk(KERN_ERR "%s: over max segments limit.\n", __func__);
                 return -EIO;
         }
@@ -1859,15 +1855,8 @@ void blk_dequeue_request(struct request *rq)
          * and to it is freed is accounted as io that is in progress at
          * the driver side.
          */
-        if (blk_account_rq(rq)) {
+        if (blk_account_rq(rq))
                 q->in_flight[rq_is_sync(rq)]++;
-                /*
-                 * Mark this device as supporting hardware queuing, if
-                 * we have more IOs in flight than 4.
-                 */
-                if (!blk_queue_queuing(q) && queue_in_flight(q) > 4)
-                        set_bit(QUEUE_FLAG_CQ, &q->queue_flags);
-        }
 }
 
 /**
@@ -2358,6 +2347,25 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq,
                 rq->rq_disk = bio->bi_bdev->bd_disk;
 }
 
+#if ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE
+/**
+ * rq_flush_dcache_pages - Helper function to flush all pages in a request
+ * @rq: the request to be flushed
+ *
+ * Description:
+ *     Flush all pages in @rq.
+ */
+void rq_flush_dcache_pages(struct request *rq)
+{
+        struct req_iterator iter;
+        struct bio_vec *bvec;
+
+        rq_for_each_segment(bvec, rq, iter)
+                flush_dcache_page(bvec->bv_page);
+}
+EXPORT_SYMBOL_GPL(rq_flush_dcache_pages);
+#endif
+
 /**
  * blk_lld_busy - Check if underlying low-level drivers of a device are busy
  * @q : the queue of the device being checked