aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/md.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r--drivers/md/md.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 0cc30ecda4c1..ca0d79c264b9 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4812,7 +4812,6 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
4812 __md_stop_writes(mddev); 4812 __md_stop_writes(mddev);
4813 md_stop(mddev); 4813 md_stop(mddev);
4814 mddev->queue->merge_bvec_fn = NULL; 4814 mddev->queue->merge_bvec_fn = NULL;
4815 mddev->queue->unplug_fn = NULL;
4816 mddev->queue->backing_dev_info.congested_fn = NULL; 4815 mddev->queue->backing_dev_info.congested_fn = NULL;
4817 4816
4818 /* tell userspace to handle 'inactive' */ 4817 /* tell userspace to handle 'inactive' */
@@ -6669,8 +6668,6 @@ EXPORT_SYMBOL_GPL(md_allow_write);
6669 6668
6670void md_unplug(mddev_t *mddev) 6669void md_unplug(mddev_t *mddev)
6671{ 6670{
6672 if (mddev->queue)
6673 blk_unplug(mddev->queue);
6674 if (mddev->plug) 6671 if (mddev->plug)
6675 mddev->plug->unplug_fn(mddev->plug); 6672 mddev->plug->unplug_fn(mddev->plug);
6676} 6673}
@@ -6853,7 +6850,6 @@ void md_do_sync(mddev_t *mddev)
6853 >= mddev->resync_max - mddev->curr_resync_completed 6850 >= mddev->resync_max - mddev->curr_resync_completed
6854 )) { 6851 )) {
6855 /* time to update curr_resync_completed */ 6852 /* time to update curr_resync_completed */
6856 md_unplug(mddev);
6857 wait_event(mddev->recovery_wait, 6853 wait_event(mddev->recovery_wait,
6858 atomic_read(&mddev->recovery_active) == 0); 6854 atomic_read(&mddev->recovery_active) == 0);
6859 mddev->curr_resync_completed = j; 6855 mddev->curr_resync_completed = j;
@@ -6929,7 +6925,6 @@ void md_do_sync(mddev_t *mddev)
6929 * about not overloading the IO subsystem. (things like an 6925 * about not overloading the IO subsystem. (things like an
6930 * e2fsck being done on the RAID array should execute fast) 6926 * e2fsck being done on the RAID array should execute fast)
6931 */ 6927 */
6932 md_unplug(mddev);
6933 cond_resched(); 6928 cond_resched();
6934 6929
6935 currspeed = ((unsigned long)(io_sectors-mddev->resync_mark_cnt))/2 6930 currspeed = ((unsigned long)(io_sectors-mddev->resync_mark_cnt))/2
@@ -6948,8 +6943,6 @@ void md_do_sync(mddev_t *mddev)
6948 * this also signals 'finished resyncing' to md_stop 6943 * this also signals 'finished resyncing' to md_stop
6949 */ 6944 */
6950 out: 6945 out:
6951 md_unplug(mddev);
6952
6953 wait_event(mddev->recovery_wait, !atomic_read(&mddev->recovery_active)); 6946 wait_event(mddev->recovery_wait, !atomic_read(&mddev->recovery_active));
6954 6947
6955 /* tell personality that we are finished */ 6948 /* tell personality that we are finished */