aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/md/bitmap.c3
-rw-r--r--drivers/md/md.c2
-rw-r--r--drivers/md/md.h1
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 8af4d655b2d3..3f04699725db 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -1296,7 +1296,7 @@ int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sect
1296 prepare_to_wait(&bitmap->overflow_wait, &__wait, 1296 prepare_to_wait(&bitmap->overflow_wait, &__wait,
1297 TASK_UNINTERRUPTIBLE); 1297 TASK_UNINTERRUPTIBLE);
1298 spin_unlock_irq(&bitmap->lock); 1298 spin_unlock_irq(&bitmap->lock);
1299 blk_unplug(bitmap->mddev->queue); 1299 md_unplug(bitmap->mddev);
1300 schedule(); 1300 schedule();
1301 finish_wait(&bitmap->overflow_wait, &__wait); 1301 finish_wait(&bitmap->overflow_wait, &__wait);
1302 continue; 1302 continue;
@@ -1306,7 +1306,6 @@ int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sect
1306 case 0: 1306 case 0:
1307 bitmap_file_set_bit(bitmap, offset); 1307 bitmap_file_set_bit(bitmap, offset);
1308 bitmap_count_page(bitmap, offset, 1); 1308 bitmap_count_page(bitmap, offset, 1);
1309 blk_plug_device_unlocked(bitmap->mddev->queue);
1310 /* fall through */ 1309 /* fall through */
1311 case 1: 1310 case 1:
1312 *bmc = 2; 1311 *bmc = 2;
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 03c64e9735fb..9d4e44e460e9 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -6627,7 +6627,7 @@ int md_allow_write(mddev_t *mddev)
6627} 6627}
6628EXPORT_SYMBOL_GPL(md_allow_write); 6628EXPORT_SYMBOL_GPL(md_allow_write);
6629 6629
6630static void md_unplug(mddev_t *mddev) 6630void md_unplug(mddev_t *mddev)
6631{ 6631{
6632 if (mddev->queue) 6632 if (mddev->queue)
6633 blk_unplug(mddev->queue); 6633 blk_unplug(mddev->queue);
diff --git a/drivers/md/md.h b/drivers/md/md.h
index 209993207a55..0a850780b5d1 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -509,6 +509,7 @@ extern int md_integrity_register(mddev_t *mddev);
509extern void md_integrity_add_rdev(mdk_rdev_t *rdev, mddev_t *mddev); 509extern void md_integrity_add_rdev(mdk_rdev_t *rdev, mddev_t *mddev);
510extern int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale); 510extern int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale);
511extern void restore_bitmap_write_access(struct file *file); 511extern void restore_bitmap_write_access(struct file *file);
512extern void md_unplug(mddev_t *mddev);
512 513
513extern void mddev_init(mddev_t *mddev); 514extern void mddev_init(mddev_t *mddev);
514extern int md_run(mddev_t *mddev); 515extern int md_run(mddev_t *mddev);