Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 18 insertions, 42 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 40b35be34f8d..d34e238afa54 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -560,7 +560,7 @@ static int read_balance(struct r1conf *conf, struct r1bio *r1_bio, int *max_sect
                 if (test_bit(WriteMostly, &rdev->flags)) {
                         /* Don't balance among write-mostly, just
                          * use the first as a last resort */
-                        if (best_disk < 0) {
+                        if (best_dist_disk < 0) {
                                 if (is_badblock(rdev, this_sector, sectors,
                                                 &first_bad, &bad_sectors)) {
                                         if (first_bad < this_sector)
@@ -569,7 +569,8 @@ static int read_balance(struct r1conf *conf, struct r1bio *r1_bio, int *max_sect
                                         best_good_sectors = first_bad - this_sector;
                                 } else
                                         best_good_sectors = sectors;
-                                best_disk = disk;
+                                best_dist_disk = disk;
+                                best_pending_disk = disk;
                         }
                         continue;
                 }
@@ -701,11 +702,10 @@ static int read_balance(struct r1conf *conf, struct r1bio *r1_bio, int *max_sect
         return best_disk;
 }
 
-static int raid1_mergeable_bvec(struct request_queue *q,
+static int raid1_mergeable_bvec(struct mddev *mddev,
                                 struct bvec_merge_data *bvm,
                                 struct bio_vec *biovec)
 {
-        struct mddev *mddev = q->queuedata;
         struct r1conf *conf = mddev->private;
         sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev);
         int max = biovec->bv_len;
@@ -734,7 +734,7 @@ static int raid1_mergeable_bvec(struct request_queue *q,
 
 }
 
-int md_raid1_congested(struct mddev *mddev, int bits)
+static int raid1_congested(struct mddev *mddev, int bits)
 {
         struct r1conf *conf = mddev->private;
         int i, ret = 0;
@@ -763,15 +763,6 @@ int md_raid1_congested(struct mddev *mddev, int bits)
         rcu_read_unlock();
         return ret;
 }
-EXPORT_SYMBOL_GPL(md_raid1_congested);
-
-static int raid1_congested(void *data, int bits)
-{
-        struct mddev *mddev = data;
-
-        return mddev_congested(mddev, bits) ||
-                md_raid1_congested(mddev, bits);
-}
 
 static void flush_pending_writes(struct r1conf *conf)
 {
@@ -2206,7 +2197,8 @@ static int narrow_write_error(struct r1bio *r1_bio, int i)
         if (rdev->badblocks.shift < 0)
                 return 0;
 
-        block_sectors = 1 << rdev->badblocks.shift;
+        block_sectors = roundup(1 << rdev->badblocks.shift,
+                                bdev_logical_block_size(rdev->bdev) >> 9);
         sector = r1_bio->sector;
         sectors = ((sector + block_sectors)
                    & ~(sector_t)(block_sectors - 1))
@@ -2882,7 +2874,7 @@ static struct r1conf *setup_conf(struct mddev *mddev)
         return ERR_PTR(err);
 }
 
-static int stop(struct mddev *mddev);
+static void raid1_free(struct mddev *mddev, void *priv);
 static int run(struct mddev *mddev)
 {
         struct r1conf *conf;
@@ -2904,7 +2896,7 @@ static int run(struct mddev *mddev)
         /*
          * copy the already verified devices into our private RAID1
          * bookkeeping area. [whatever we allocate in run(),
-         * should be freed in stop()]
+         * should be freed in raid1_free()]
          */
         if (mddev->private == NULL)
                 conf = setup_conf(mddev);
@@ -2955,10 +2947,6 @@ static int run(struct mddev *mddev)
         md_set_array_sectors(mddev, raid1_size(mddev, 0, 0));
 
         if (mddev->queue) {
-                mddev->queue->backing_dev_info.congested_fn = raid1_congested;
-                mddev->queue->backing_dev_info.congested_data = mddev;
-                blk_queue_merge_bvec(mddev->queue, raid1_mergeable_bvec);
-
                 if (discard_supported)
                         queue_flag_set_unlocked(QUEUE_FLAG_DISCARD,
                                                 mddev->queue);
@@ -2968,37 +2956,23 @@ static int run(struct mddev *mddev)
         }
 
         ret =  md_integrity_register(mddev);
-        if (ret)
-                stop(mddev);
+        if (ret) {
+                md_unregister_thread(&mddev->thread);
+                raid1_free(mddev, conf);
+        }
         return ret;
 }
 
-static int stop(struct mddev *mddev)
+static void raid1_free(struct mddev *mddev, void *priv)
 {
-        struct r1conf *conf = mddev->private;
-        struct bitmap *bitmap = mddev->bitmap;
+        struct r1conf *conf = priv;
 
-        /* wait for behind writes to complete */
-        if (bitmap && atomic_read(&bitmap->behind_writes) > 0) {
-                printk(KERN_INFO "md/raid1:%s: behind writes in progress - waiting to stop.\n",
-                       mdname(mddev));
-                /* need to kick something here to make sure I/O goes? */
-                wait_event(bitmap->behind_wait,
-                           atomic_read(&bitmap->behind_writes) == 0);
-        }
-
-        freeze_array(conf, 0);
-        unfreeze_array(conf);
-
-        md_unregister_thread(&mddev->thread);
         if (conf->r1bio_pool)
                 mempool_destroy(conf->r1bio_pool);
         kfree(conf->mirrors);
         safe_put_page(conf->tmppage);
         kfree(conf->poolinfo);
         kfree(conf);
-        mddev->private = NULL;
-        return 0;
 }
 
 static int raid1_resize(struct mddev *mddev, sector_t sectors)
@@ -3181,7 +3155,7 @@ static struct md_personality raid1_personality =
         .owner          = THIS_MODULE,
         .make_request   = make_request,
         .run            = run,
-        .stop           = stop,
+        .free           = raid1_free,
         .status         = status,
         .error_handler  = error,
         .hot_add_disk   = raid1_add_disk,
@@ -3193,6 +3167,8 @@ static struct md_personality raid1_personality =
         .check_reshape  = raid1_reshape,
         .quiesce        = raid1_quiesce,
         .takeover       = raid1_takeover,
+        .congested      = raid1_congested,
+        .mergeable_bvec = raid1_mergeable_bvec,
 };
 
 static int __init raid_init(void)