9 files changed, 63 insertions, 26 deletions

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 4840733cd903..3d7f4923cd13 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -441,13 +441,13 @@ static void process_queued_ios(struct work_struct *work)
                 __choose_pgpath(m);
 
         pgpath = m->current_pgpath;
-        m->pgpath_to_activate = m->current_pgpath;
 
         if ((pgpath && !m->queue_io) ||
             (!pgpath && !m->queue_if_no_path))
                 must_queue = 0;
 
-        if (m->pg_init_required && !m->pg_init_in_progress) {
+        if (m->pg_init_required && !m->pg_init_in_progress && pgpath) {
+                m->pgpath_to_activate = pgpath;
                 m->pg_init_count++;
                 m->pg_init_required = 0;
                 m->pg_init_in_progress = 1;
@@ -708,6 +708,10 @@ static int parse_hw_handler(struct arg_set *as, struct multipath *m)
                 m->hw_handler_name = NULL;
                 return -EINVAL;
         }
+
+        if (hw_argc > 1)
+                DMWARN("Ignoring user-specified arguments for "
+                       "hardware handler \"%s\"", m->hw_handler_name);
         consume(as, hw_argc - 1);
 
         return 0;
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 92dcc06832a4..ec43f9fa4b2a 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -656,9 +656,10 @@ static void do_failures(struct mirror_set *ms, struct bio_list *failures)
                 return;
 
         if (!ms->log_failure) {
-                while ((bio = bio_list_pop(failures)))
+                while ((bio = bio_list_pop(failures))) {
                         ms->in_sync = 0;
                         dm_rh_mark_nosync(ms->rh, bio, bio->bi_size, 0);
+                }
                 return;
         }
 
@@ -1031,6 +1032,7 @@ static void mirror_dtr(struct dm_target *ti)
 
         del_timer_sync(&ms->timer);
         flush_workqueue(ms->kmirrord_wq);
+        flush_scheduled_work();
         dm_kcopyd_client_destroy(ms->kcopyd_client);
         destroy_workqueue(ms->kmirrord_wq);
         free_context(ms, ti, ms->nr_mirrors);
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index b2d9d1ac28ad..6c96db26b87c 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -229,19 +229,21 @@ static void __insert_origin(struct origin *o)
  */
 static int register_snapshot(struct dm_snapshot *snap)
 {
-        struct origin *o;
+        struct origin *o, *new_o;
         struct block_device *bdev = snap->origin->bdev;
 
+        new_o = kmalloc(sizeof(*new_o), GFP_KERNEL);
+        if (!new_o)
+                return -ENOMEM;
+
         down_write(&_origins_lock);
         o = __lookup_origin(bdev);
 
-        if (!o) {
+        if (o)
+                kfree(new_o);
+        else {
                 /* New origin */
-                o = kmalloc(sizeof(*o), GFP_KERNEL);
-                if (!o) {
-                        up_write(&_origins_lock);
-                        return -ENOMEM;
-                }
+                o = new_o;
 
                 /* Initialise the struct */
                 INIT_LIST_HEAD(&o->snapshots);
@@ -368,6 +370,7 @@ static struct dm_snap_pending_exception *alloc_pending_exception(struct dm_snaps
         struct dm_snap_pending_exception *pe = mempool_alloc(s->pending_pool,
                                                              GFP_NOIO);
 
+        atomic_inc(&s->pending_exceptions_count);
         pe->snap = s;
 
         return pe;
@@ -375,7 +378,11 @@ static struct dm_snap_pending_exception *alloc_pending_exception(struct dm_snaps
 
 static void free_pending_exception(struct dm_snap_pending_exception *pe)
 {
-        mempool_free(pe, pe->snap->pending_pool);
+        struct dm_snapshot *s = pe->snap;
+
+        mempool_free(pe, s->pending_pool);
+        smp_mb__before_atomic_dec();
+        atomic_dec(&s->pending_exceptions_count);
 }
 
 static void insert_completed_exception(struct dm_snapshot *s,
@@ -600,6 +607,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
         s->valid = 1;
         s->active = 0;
+        atomic_set(&s->pending_exceptions_count, 0);
         init_rwsem(&s->lock);
         spin_lock_init(&s->pe_lock);
         s->ti = ti;
@@ -726,6 +734,14 @@ static void snapshot_dtr(struct dm_target *ti)
         /* After this returns there can be no new kcopyd jobs. */
         unregister_snapshot(s);
 
+        while (atomic_read(&s->pending_exceptions_count))
+                yield();
+        /*
+         * Ensure instructions in mempool_destroy aren't reordered
+         * before atomic_read.
+         */
+        smp_mb();
+
 #ifdef CONFIG_DM_DEBUG
         for (i = 0; i < DM_TRACKED_CHUNK_HASH_SIZE; i++)
                 BUG_ON(!hlist_empty(&s->tracked_chunk_hash[i]));
diff --git a/drivers/md/dm-snap.h b/drivers/md/dm-snap.h
index f07315fe2362..99c0106ede2d 100644
--- a/drivers/md/dm-snap.h
+++ b/drivers/md/dm-snap.h
@@ -160,6 +160,8 @@ struct dm_snapshot {
 
         mempool_t *pending_pool;
 
+        atomic_t pending_exceptions_count;
+
         struct exception_table pending;
         struct exception_table complete;
 
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index a2d068dbe9e2..9e4ef88d421e 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -320,8 +320,10 @@ int __init dm_stripe_init(void)
         int r;
 
         r = dm_register_target(&stripe_target);
-        if (r < 0)
+        if (r < 0) {
                 DMWARN("target registration failed");
+                return r;
+        }
 
         kstriped = create_singlethread_workqueue("kstriped");
         if (!kstriped) {
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 6963ad148408..c99e4728ff41 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -375,7 +375,7 @@ static void start_io_acct(struct dm_io *io)
         dm_disk(md)->part0.in_flight = atomic_inc_return(&md->pending);
 }
 
-static int end_io_acct(struct dm_io *io)
+static void end_io_acct(struct dm_io *io)
 {
         struct mapped_device *md = io->md;
         struct bio *bio = io->bio;
@@ -391,7 +391,9 @@ static int end_io_acct(struct dm_io *io)
         dm_disk(md)->part0.in_flight = pending =
                 atomic_dec_return(&md->pending);
 
-        return !pending;
+        /* nudge anyone waiting on suspend queue */
+        if (!pending)
+                wake_up(&md->wait);
 }
 
 /*
@@ -499,9 +501,7 @@ static void dec_pending(struct dm_io *io, int error)
                         spin_unlock_irqrestore(&io->md->pushback_lock, flags);
                 }
 
-                if (end_io_acct(io))
-                        /* nudge anyone waiting on suspend queue */
-                        wake_up(&io->md->wait);
+                end_io_acct(io);
 
                 if (io->error != DM_ENDIO_REQUEUE) {
                         blk_add_trace_bio(io->md->queue, io->bio,
@@ -937,16 +937,24 @@ static void dm_unplug_all(struct request_queue *q)
 
 static int dm_any_congested(void *congested_data, int bdi_bits)
 {
-        int r;
-        struct mapped_device *md = (struct mapped_device *) congested_data;
-        struct dm_table *map = dm_get_table(md);
+        int r = bdi_bits;
+        struct mapped_device *md = congested_data;
+        struct dm_table *map;
 
-        if (!map || test_bit(DMF_BLOCK_IO, &md->flags))
-                r = bdi_bits;
-        else
-                r = dm_table_any_congested(map, bdi_bits);
+        atomic_inc(&md->pending);
+
+        if (!test_bit(DMF_BLOCK_IO, &md->flags)) {
+                map = dm_get_table(md);
+                if (map) {
+                        r = dm_table_any_congested(map, bdi_bits);
+                        dm_table_put(map);
+                }
+        }
+
+        if (!atomic_dec_return(&md->pending))
+                /* nudge anyone waiting on suspend queue */
+                wake_up(&md->wait);
 
-        dm_table_put(map);
         return r;
 }
 
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 190147c79e79..3b90c5c924ec 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -148,6 +148,8 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)
 
         min_sectors = conf->array_sectors;
         sector_div(min_sectors, PAGE_SIZE/sizeof(struct dev_info *));
+        if (min_sectors == 0)
+                min_sectors = 1;
 
         /* min_sectors is the minimum spacing that will fit the hash
          * table in one PAGE.  This may be much smaller than needed.
diff --git a/drivers/md/md.c b/drivers/md/md.c
index b4162f6f1b79..1b1d32694f6f 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3940,6 +3940,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
                 mddev->degraded = 0;
                 mddev->barriers_work = 0;
                 mddev->safemode = 0;
+                kobject_uevent(&disk_to_dev(mddev->gendisk)->kobj, KOBJ_CHANGE);
 
         } else if (mddev->pers)
                 printk(KERN_INFO "md: %s switched to read-only mode.\n",
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index da5129a24b18..970a96ef9b18 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1137,7 +1137,7 @@ static int raid10_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
         if (!enough(conf))
                 return -EINVAL;
 
-        if (rdev->raid_disk)
+        if (rdev->raid_disk >= 0)
                 first = last = rdev->raid_disk;
 
         if (rdev->saved_raid_disk >= 0 &&