10 files changed, 47 insertions, 24 deletions

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index a625576fdeeb..08a40f4e4f60 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -915,8 +915,6 @@ static int crypt_status(struct dm_target *ti, status_type_t type,
                         char *result, unsigned int maxlen)
 {
         struct crypt_config *cc = (struct crypt_config *) ti->private;
-        const char *cipher;
-        const char *chainmode = NULL;
         unsigned int sz = 0;
 
         switch (type) {
@@ -925,14 +923,11 @@ static int crypt_status(struct dm_target *ti, status_type_t type,
                 break;
 
         case STATUSTYPE_TABLE:
-                cipher = crypto_blkcipher_name(cc->tfm);
-
-                chainmode = cc->chainmode;
-
                 if (cc->iv_mode)
-                        DMEMIT("%s-%s-%s ", cipher, chainmode, cc->iv_mode);
+                        DMEMIT("%s-%s-%s ", cc->cipher, cc->chainmode,
+                               cc->iv_mode);
                 else
-                        DMEMIT("%s-%s ", cipher, chainmode);
+                        DMEMIT("%s-%s ", cc->cipher, cc->chainmode);
 
                 if (cc->key_size > 0) {
                         if ((maxlen - sz) < ((cc->key_size << 1) + 1))
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index d13bb15a8a02..4510ad8f971c 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -606,9 +606,14 @@ static struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param)
                 return __get_name_cell(param->name);
 
         md = dm_get_md(huge_decode_dev(param->dev));
-        if (md)
-                mdptr = dm_get_mdptr(md);
+        if (!md)
+                goto out;
 
+        mdptr = dm_get_mdptr(md);
+        if (!mdptr)
+                dm_put(md);
+
+out:
         return mdptr;
 }
 
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 659224cb7c53..48a653b3f518 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -24,6 +24,7 @@
 
 static struct workqueue_struct *_kmirrord_wq;
 static struct work_struct _kmirrord_work;
+static DECLARE_WAIT_QUEUE_HEAD(_kmirrord_recovery_stopped);
 
 static inline void wake(void)
 {
@@ -83,6 +84,7 @@ struct region_hash {
         struct list_head *buckets;
 
         spinlock_t region_lock;
+        atomic_t recovery_in_flight;
         struct semaphore recovery_count;
         struct list_head clean_regions;
         struct list_head quiesced_regions;
@@ -191,6 +193,7 @@ static int rh_init(struct region_hash *rh, struct mirror_set *ms,
 
         spin_lock_init(&rh->region_lock);
         sema_init(&rh->recovery_count, 0);
+        atomic_set(&rh->recovery_in_flight, 0);
         INIT_LIST_HEAD(&rh->clean_regions);
         INIT_LIST_HEAD(&rh->quiesced_regions);
         INIT_LIST_HEAD(&rh->recovered_regions);
@@ -382,6 +385,8 @@ static void rh_update_states(struct region_hash *rh)
                 rh->log->type->clear_region(rh->log, reg->key);
                 rh->log->type->complete_resync_work(rh->log, reg->key, 1);
                 dispatch_bios(rh->ms, &reg->delayed_bios);
+                if (atomic_dec_and_test(&rh->recovery_in_flight))
+                        wake_up_all(&_kmirrord_recovery_stopped);
                 up(&rh->recovery_count);
                 mempool_free(reg, rh->region_pool);
         }
@@ -502,11 +507,21 @@ static int __rh_recovery_prepare(struct region_hash *rh)
 
 static void rh_recovery_prepare(struct region_hash *rh)
 {
-        while (!down_trylock(&rh->recovery_count))
+        /* Extra reference to avoid race with rh_stop_recovery */
+        atomic_inc(&rh->recovery_in_flight);
+
+        while (!down_trylock(&rh->recovery_count)) {
+                atomic_inc(&rh->recovery_in_flight);
                 if (__rh_recovery_prepare(rh) <= 0) {
+                        atomic_dec(&rh->recovery_in_flight);
                         up(&rh->recovery_count);
                         break;
                 }
+        }
+
+        /* Drop the extra reference */
+        if (atomic_dec_and_test(&rh->recovery_in_flight))
+                wake_up_all(&_kmirrord_recovery_stopped);
 }
 
 /*
@@ -1177,6 +1192,11 @@ static void mirror_postsuspend(struct dm_target *ti)
         struct dirty_log *log = ms->rh.log;
 
         rh_stop_recovery(&ms->rh);
+
+        /* Wait for all I/O we generated to complete */
+        wait_event(_kmirrord_recovery_stopped,
+                   !atomic_read(&ms->rh.recovery_in_flight));
+
         if (log->type->suspend && log->type->suspend(log))
                 /* FIXME: need better error handling */
                 DMWARN("log suspend failed");
diff --git a/drivers/md/dm-round-robin.c b/drivers/md/dm-round-robin.c
index c5a16c550122..6f9fcd4db9b5 100644
--- a/drivers/md/dm-round-robin.c
+++ b/drivers/md/dm-round-robin.c
@@ -136,7 +136,7 @@ static int rr_add_path(struct path_selector *ps, struct path *path,
 
         path->pscontext = pi;
 
-        list_add(&pi->list, &s->valid_paths);
+        list_add_tail(&pi->list, &s->valid_paths);
 
         return 0;
 }
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index b5764a86c8b5..fc4f743f3b53 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1285,7 +1285,7 @@ int dm_suspend(struct mapped_device *md, int do_lockfs)
         down(&md->suspend_lock);
 
         if (dm_suspended(md))
-                goto out;
+                goto out_unlock;
 
         map = dm_get_table(md);
 
@@ -1361,6 +1361,8 @@ out:
         }
 
         dm_table_put(map);
+
+out_unlock:
         up(&md->suspend_lock);
         return r;
 }
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 7daa7b1e145f..8cbf9c9df1c3 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2003,6 +2003,7 @@ static mdk_rdev_t *md_import_device(dev_t newdev, int super_format, int super_mi
         kobject_init(&rdev->kobj);
 
         rdev->desc_nr = -1;
+        rdev->saved_raid_disk = -1;
         rdev->flags = 0;
         rdev->data_offset = 0;
         rdev->sb_events = 0;
@@ -3199,6 +3200,7 @@ static int do_md_run(mddev_t * mddev)
 
         mddev->changed = 1;
         md_new_event(mddev);
+        kobject_uevent(&mddev->gendisk->kobj, KOBJ_CHANGE);
         return 0;
 }
 
@@ -4044,11 +4046,8 @@ static int update_size(mddev_t *mddev, unsigned long size)
                 return -EBUSY;
         ITERATE_RDEV(mddev,rdev,tmp) {
                 sector_t avail;
-                if (rdev->sb_offset > rdev->data_offset)
-                        avail = (rdev->sb_offset*2) - rdev->data_offset;
-                else
-                        avail = get_capacity(rdev->bdev->bd_disk)
-                                - rdev->data_offset;
+                avail = rdev->size * 2;
+
                 if (fit && (size == 0 || size > avail/2))
                         size = avail/2;
                 if (avail < ((sector_t)size << 1))
@@ -4487,6 +4486,7 @@ static int md_thread(void * arg)
          * many dirty RAID5 blocks.
          */
 
+        current->flags |= PF_NOFREEZE;
         allow_signal(SIGKILL);
         while (!kthread_should_stop()) {
 
@@ -4503,7 +4503,6 @@ static int md_thread(void * arg)
                          test_bit(THREAD_WAKEUP, &thread->flags)
                          || kthread_should_stop(),
                          thread->timeout);
-                try_to_freeze();
 
                 clear_bit(THREAD_WAKEUP, &thread->flags);
 
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index a6260f0e3b9e..14da37fee37b 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -277,6 +277,7 @@ static void multipath_error (mddev_t *mddev, mdk_rdev_t *rdev)
                         set_bit(Faulty, &rdev->flags);
                         set_bit(MD_CHANGE_DEVS, &mddev->flags);
                         conf->working_disks--;
+                        mddev->degraded++;
                         printk(KERN_ALERT "multipath: IO failure on %s,"
                                 " disabling IO path. \n Operation continuing"
                                 " on %d IO paths.\n",
@@ -336,6 +337,7 @@ static int multipath_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
                                 blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
 
                         conf->working_disks++;
+                        mddev->degraded--;
                         rdev->raid_disk = path;
                         set_bit(In_sync, &rdev->flags);
                         rcu_assign_pointer(p->rdev, rdev);
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index dc9d2def0270..656fae912fe3 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1474,8 +1474,8 @@ static void fix_read_error(conf_t *conf, int read_disk,
                                                "raid1:%s: read error corrected "
                                                "(%d sectors at %llu on %s)\n",
                                                mdname(mddev), s,
-                                               (unsigned long long)sect +
-                                                   rdev->data_offset,
+                                               (unsigned long long)(sect +
+                                                   rdev->data_offset),
                                                bdevname(rdev->bdev, b));
                                 }
                         }
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 74f17a9a6ebb..7492d6033ac6 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1470,8 +1470,8 @@ static void fix_read_error(conf_t *conf, mddev_t *mddev, r10bio_t *r10_bio)
                                                "raid10:%s: read error corrected"
                                                " (%d sectors at %llu on %s)\n",
                                                mdname(mddev), s,
-                                               (unsigned long long)sect+
-                                                    rdev->data_offset,
+                                               (unsigned long long)(sect+
+                                                    rdev->data_offset),
                                                bdevname(rdev->bdev, b));
 
                                 rdev_dec_pending(rdev, mddev);
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index e14f45780720..69c3e201fa3b 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3659,7 +3659,7 @@ static void end_reshape(raid5_conf_t *conf)
                 bdev = bdget_disk(conf->mddev->gendisk, 0);
                 if (bdev) {
                         mutex_lock(&bdev->bd_inode->i_mutex);
-                        i_size_write(bdev->bd_inode, conf->mddev->array_size << 10);
+                        i_size_write(bdev->bd_inode, (loff_t)conf->mddev->array_size << 10);
                         mutex_unlock(&bdev->bd_inode->i_mutex);
                         bdput(bdev);
                 }