Merge tag 'md-3.8' of git://neil.brown.name/md
[~shefty/rdma-dev.git] / drivers / md / raid5.c
index ffebc1e8f483179a809bf6a87132898d8238a5c3..19d77a02663972c3daa9d74295c820d2bb85ba37 100644 (file)
@@ -470,7 +470,7 @@ get_active_stripe(struct r5conf *conf, sector_t sector,
        do {
                wait_event_lock_irq(conf->wait_for_stripe,
                                    conf->quiesce == 0 || noquiesce,
-                                   conf->device_lock, /* nothing */);
+                                   conf->device_lock);
                sh = __find_stripe(conf, sector, conf->generation - previous);
                if (!sh) {
                        if (!conf->inactive_blocked)
@@ -484,8 +484,7 @@ get_active_stripe(struct r5conf *conf, sector_t sector,
                                                    (atomic_read(&conf->active_stripes)
                                                     < (conf->max_nr_stripes *3/4)
                                                     || !conf->inactive_blocked),
-                                                   conf->device_lock,
-                                                   );
+                                                   conf->device_lock);
                                conf->inactive_blocked = 0;
                        } else
                                init_stripe(sh, sector, previous);
@@ -1586,7 +1585,7 @@ static int resize_stripes(struct r5conf *conf, int newsize)
         * This happens in stages:
         * 1/ create a new kmem_cache and allocate the required number of
         *    stripe_heads.
-        * 2/ gather all the old stripe_heads and tranfer the pages across
+        * 2/ gather all the old stripe_heads and transfer the pages across
         *    to the new stripe_heads.  This will have the side effect of
         *    freezing the array as once all stripe_heads have been collected,
         *    no IO will be possible.  Old stripe heads are freed once their
@@ -1656,8 +1655,7 @@ static int resize_stripes(struct r5conf *conf, int newsize)
                spin_lock_irq(&conf->device_lock);
                wait_event_lock_irq(conf->wait_for_stripe,
                                    !list_empty(&conf->inactive_list),
-                                   conf->device_lock,
-                                   );
+                                   conf->device_lock);
                osh = get_free_stripe(conf);
                spin_unlock_irq(&conf->device_lock);
                atomic_set(&nsh->count, 1);
@@ -4021,7 +4019,7 @@ static int chunk_aligned_read(struct mddev *mddev, struct bio * raid_bio)
                spin_lock_irq(&conf->device_lock);
                wait_event_lock_irq(conf->wait_for_stripe,
                                    conf->quiesce == 0,
-                                   conf->device_lock, /* nothing */);
+                                   conf->device_lock);
                atomic_inc(&conf->active_aligned_reads);
                spin_unlock_irq(&conf->device_lock);
 
@@ -6124,7 +6122,7 @@ static void raid5_quiesce(struct mddev *mddev, int state)
                wait_event_lock_irq(conf->wait_for_stripe,
                                    atomic_read(&conf->active_stripes) == 0 &&
                                    atomic_read(&conf->active_aligned_reads) == 0,
-                                   conf->device_lock, /* nothing */);
+                                   conf->device_lock);
                conf->quiesce = 1;
                spin_unlock_irq(&conf->device_lock);
                /* allow reshape to continue */