Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / md / raid5.c

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 5287e79..92ac251 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -6370,7 +6370,7 @@ static void free_conf(struct r5conf *conf)
 {
        if (conf->log)
                r5l_exit_log(conf->log);
-       if (conf->shrinker.seeks)
+       if (conf->shrinker.nr_deferred)
                unregister_shrinker(&conf->shrinker);
 
        free_thread_groups(conf);
@@ -6632,7 +6632,12 @@ static struct r5conf *setup_conf(struct mddev *mddev)
        conf->shrinker.count_objects = raid5_cache_count;
        conf->shrinker.batch = 128;
        conf->shrinker.flags = 0;
-       register_shrinker(&conf->shrinker);
+       if (register_shrinker(&conf->shrinker)) {
+               printk(KERN_ERR
+                      "md/raid:%s: couldn't register shrinker.\n",
+                      mdname(mddev));
+               goto abort;
+       }
 
        sprintf(pers_name, "raid%d", mddev->new_level);
        conf->thread = md_register_thread(raid5d, mddev, pers_name);
@@ -7028,6 +7033,8 @@ static int raid5_run(struct mddev *mddev)
                else
                        queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD,
                                                mddev->queue);
+
+               blk_queue_max_hw_sectors(mddev->queue, UINT_MAX);
        }
 
        if (journal_dev) {