5 files changed, 5 insertions, 14 deletions

diff --git a/drivers/md/md.c b/drivers/md/md.c
index d5ab4493c8be..34381172a947 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -514,8 +514,7 @@ struct md_plug_cb {
 static void plugger_unplug(struct blk_plug_cb *cb)
 {
         struct md_plug_cb *mdcb = container_of(cb, struct md_plug_cb, cb);
-        if (atomic_dec_and_test(&mdcb->mddev->plug_cnt))
-                md_wakeup_thread(mdcb->mddev->thread);
+        md_wakeup_thread(mdcb->mddev->thread);
         kfree(mdcb);
 }
 
@@ -548,7 +547,6 @@ int mddev_check_plugged(struct mddev *mddev)
 
         mdcb->mddev = mddev;
         mdcb->cb.callback = plugger_unplug;
-        atomic_inc(&mddev->plug_cnt);
         list_add(&mdcb->cb.list, &plug->cb_list);
         return 1;
 }
@@ -602,7 +600,6 @@ void mddev_init(struct mddev *mddev)
         atomic_set(&mddev->active, 1);
         atomic_set(&mddev->openers, 0);
         atomic_set(&mddev->active_io, 0);
-        atomic_set(&mddev->plug_cnt, 0);
         spin_lock_init(&mddev->write_lock);
         atomic_set(&mddev->flush_pending, 0);
         init_waitqueue_head(&mddev->sb_wait);
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 7b4a3c318cae..91786c46b85c 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -266,9 +266,6 @@ struct mddev {
         int                             new_chunk_sectors;
         int                             reshape_backwards;
 
-        atomic_t                        plug_cnt;       /* If device is expecting
-                                                         * more bios soon.
-                                                         */
         struct md_thread                *thread;        /* management thread */
         struct md_thread                *sync_thread;   /* doing resync or reconstruct */
         sector_t                        curr_resync;    /* last block scheduled */
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index cacd008d6864..36a8fc059ac3 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2173,8 +2173,7 @@ static void raid1d(struct mddev *mddev)
         blk_start_plug(&plug);
         for (;;) {
 
-                if (atomic_read(&mddev->plug_cnt) == 0)
-                        flush_pending_writes(conf);
+                flush_pending_writes(conf);
 
                 spin_lock_irqsave(&conf->device_lock, flags);
                 if (list_empty(head)) {
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 8da6282254c3..5d33603a497d 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -2660,8 +2660,7 @@ static void raid10d(struct mddev *mddev)
         blk_start_plug(&plug);
         for (;;) {
 
-                if (atomic_read(&mddev->plug_cnt) == 0)
-                        flush_pending_writes(conf);
+                flush_pending_writes(conf);
 
                 spin_lock_irqsave(&conf->device_lock, flags);
                 if (list_empty(head)) {
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 04348d76bb30..bde9da2baa39 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -4543,7 +4543,7 @@ static void raid5d(struct mddev *mddev)
         while (1) {
                 struct bio *bio;
 
-                if (atomic_read(&mddev->plug_cnt) == 0 &&
+                if (
                     !list_empty(&conf->bitmap_list)) {
                         /* Now is a good time to flush some bitmap updates */
                         conf->seq_flush++;
@@ -4553,8 +4553,7 @@ static void raid5d(struct mddev *mddev)
                         conf->seq_write = conf->seq_flush;
                         activate_bit_delay(conf);
                 }
-                if (atomic_read(&mddev->plug_cnt) == 0)
-                        raid5_activate_delayed(conf);
+                raid5_activate_delayed(conf);
 
                 while ((bio = remove_bio_from_retry(conf))) {
                         int ok;