1 files changed, 7 insertions, 4 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 1d49e1c7c905..f8cb09951830 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1282,10 +1282,8 @@ get_rq:
         init_request_from_bio(req, bio);
 
         if (test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags) ||
-            bio_flagged(bio, BIO_CPU_AFFINE)) {
-                req->cpu = blk_cpu_to_group(get_cpu());
-                put_cpu();
-        }
+            bio_flagged(bio, BIO_CPU_AFFINE))
+                req->cpu = smp_processor_id();
 
         plug = current->plug;
         if (plug) {
@@ -1305,7 +1303,10 @@ get_rq:
                                 plug->should_sort = 1;
                 }
                 list_add_tail(&req->queuelist, &plug->list);
+                plug->count++;
                 drive_stat_acct(req, 1);
+                if (plug->count >= BLK_MAX_REQUEST_COUNT)
+                        blk_flush_plug_list(plug, false);
         } else {
                 spin_lock_irq(q->queue_lock);
                 add_acct_request(q, req, where);
@@ -2629,6 +2630,7 @@ void blk_start_plug(struct blk_plug *plug)
         INIT_LIST_HEAD(&plug->list);
         INIT_LIST_HEAD(&plug->cb_list);
         plug->should_sort = 0;
+        plug->count = 0;
 
         /*
          * If this is a nested plug, don't actually assign it. It will be
@@ -2712,6 +2714,7 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
                 return;
 
         list_splice_init(&plug->list, &list);
+        plug->count = 0;
 
         if (plug->should_sort) {
                 list_sort(NULL, &list, plug_rq_cmp);