1 files changed, 34 insertions, 24 deletions

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 41e2509bf896..a307f87eb90e 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -214,12 +214,7 @@ static inline mddev_t *mddev_get(mddev_t *mddev)
         return mddev;
 }
 
-static void mddev_delayed_delete(struct work_struct *ws)
-{
-        mddev_t *mddev = container_of(ws, mddev_t, del_work);
-        kobject_del(&mddev->kobj);
-        kobject_put(&mddev->kobj);
-}
+static void mddev_delayed_delete(struct work_struct *ws);
 
 static void mddev_put(mddev_t *mddev)
 {
@@ -474,7 +469,7 @@ void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev,
          * causes ENOTSUPP, we allocate a spare bio...
          */
         struct bio *bio = bio_alloc(GFP_NOIO, 1);
-        int rw = (1<<BIO_RW) | (1<<BIO_RW_SYNC);
+        int rw = (1<<BIO_RW) | (1<<BIO_RW_SYNCIO) | (1<<BIO_RW_UNPLUG);
 
         bio->bi_bdev = rdev->bdev;
         bio->bi_sector = sector;
@@ -531,7 +526,7 @@ int sync_page_io(struct block_device *bdev, sector_t sector, int size,
         struct completion event;
         int ret;
 
-        rw |= (1 << BIO_RW_SYNC);
+        rw |= (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG);
 
         bio->bi_bdev = bdev;
         bio->bi_sector = sector;
@@ -1481,6 +1476,11 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
                 if (find_rdev_nr(mddev, rdev->desc_nr))
                         return -EBUSY;
         }
+        if (mddev->max_disks && rdev->desc_nr >= mddev->max_disks) {
+                printk(KERN_WARNING "md: %s: array is limited to %d devices\n",
+                       mdname(mddev), mddev->max_disks);
+                return -EBUSY;
+        }
         bdevname(rdev->bdev,b);
         while ( (s=strchr(b, '/')) != NULL)
                 *s = '!';
@@ -2441,6 +2441,15 @@ static void analyze_sbs(mddev_t * mddev)
 
         i = 0;
         rdev_for_each(rdev, tmp, mddev) {
+                if (rdev->desc_nr >= mddev->max_disks ||
+                    i > mddev->max_disks) {
+                        printk(KERN_WARNING
+                               "md: %s: %s: only %d devices permitted\n",
+                               mdname(mddev), bdevname(rdev->bdev, b),
+                               mddev->max_disks);
+                        kick_rdev_from_array(rdev);
+                        continue;
+                }
                 if (rdev != freshest)
                         if (super_types[mddev->major_version].
                             validate_super(mddev, rdev)) {
@@ -3528,6 +3537,21 @@ static struct kobj_type md_ktype = {
 
 int mdp_major = 0;
 
+static void mddev_delayed_delete(struct work_struct *ws)
+{
+        mddev_t *mddev = container_of(ws, mddev_t, del_work);
+
+        if (mddev->private == &md_redundancy_group) {
+                sysfs_remove_group(&mddev->kobj, &md_redundancy_group);
+                if (mddev->sysfs_action)
+                        sysfs_put(mddev->sysfs_action);
+                mddev->sysfs_action = NULL;
+                mddev->private = NULL;
+        }
+        kobject_del(&mddev->kobj);
+        kobject_put(&mddev->kobj);
+}
+
 static int md_alloc(dev_t dev, char *name)
 {
         static DEFINE_MUTEX(disks_mutex);
@@ -4019,13 +4043,9 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
                         mddev->queue->merge_bvec_fn = NULL;
                         mddev->queue->unplug_fn = NULL;
                         mddev->queue->backing_dev_info.congested_fn = NULL;
-                        if (mddev->pers->sync_request) {
-                                sysfs_remove_group(&mddev->kobj, &md_redundancy_group);
-                                if (mddev->sysfs_action)
-                                        sysfs_put(mddev->sysfs_action);
-                                mddev->sysfs_action = NULL;
-                        }
                         module_put(mddev->pers->owner);
+                        if (mddev->pers->sync_request)
+                                mddev->private = &md_redundancy_group;
                         mddev->pers = NULL;
                         /* tell userspace to handle 'inactive' */
                         sysfs_notify_dirent(mddev->sysfs_state);
@@ -4614,13 +4634,6 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
          * noticed in interrupt contexts ...
          */
 
-        if (rdev->desc_nr == mddev->max_disks) {
-                printk(KERN_WARNING "%s: can not hot-add to full array!\n",
-                        mdname(mddev));
-                err = -EBUSY;
-                goto abort_unbind_export;
-        }
-
         rdev->raid_disk = -1;
 
         md_update_sb(mddev, 1);
@@ -4634,9 +4647,6 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
         md_new_event(mddev);
         return 0;
 
-abort_unbind_export:
-        unbind_rdev_from_array(rdev);
-
 abort_export:
         export_rdev(rdev);
         return err;