Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux.git] / drivers / md / dm-raid.c

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index c412eaa975fc0762e4fd742f01f661ee94e56d16..9a18bef0a5ff009d06bd512a49e63aec0f0de270 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -129,7 +129,9 @@ struct raid_dev {
                                  CTR_FLAG_RAID10_COPIES | \
                                  CTR_FLAG_RAID10_FORMAT | \
                                  CTR_FLAG_DELTA_DISKS | \
-                                 CTR_FLAG_DATA_OFFSET)
+                                 CTR_FLAG_DATA_OFFSET | \
+                                 CTR_FLAG_JOURNAL_DEV | \
+                                 CTR_FLAG_JOURNAL_MODE)
 
 /* Valid options definitions per raid level... */
 
@@ -3001,7 +3003,6 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                { 1, 254, "Cannot understand number of raid devices parameters" }
        };
 
-       /* Must have <raid_type> */
        arg = dm_shift_arg(&as);
        if (!arg) {
                ti->error = "No arguments";
@@ -3508,8 +3509,7 @@ static void raid_status(struct dm_target *ti, status_type_t type,
        unsigned long recovery;
        unsigned int raid_param_cnt = 1; /* at least 1 for chunksize */
        unsigned int sz = 0;
-       unsigned int rebuild_disks;
-       unsigned int write_mostly_params = 0;
+       unsigned int rebuild_writemostly_count = 0;
        sector_t progress, resync_max_sectors, resync_mismatches;
        enum sync_state state;
        struct raid_type *rt;
@@ -3593,18 +3593,20 @@ static void raid_status(struct dm_target *ti, status_type_t type,
        case STATUSTYPE_TABLE:
                /* Report the table line string you would use to construct this raid set */
 
-               /* Calculate raid parameter count */
-               for (i = 0; i < rs->raid_disks; i++)
-                       if (test_bit(WriteMostly, &rs->dev[i].rdev.flags))
-                               write_mostly_params += 2;
-               rebuild_disks = memweight(rs->rebuild_disks, DISKS_ARRAY_ELEMS * sizeof(*rs->rebuild_disks));
-               raid_param_cnt += rebuild_disks * 2 +
-                                 write_mostly_params +
+               /*
+                * Count any rebuild or writemostly argument pairs and subtract the
+                * hweight count being added below of any rebuild and writemostly ctr flags.
+                */
+               for (i = 0; i < rs->raid_disks; i++) {
+                       rebuild_writemostly_count += (test_bit(i, (void *) rs->rebuild_disks) ? 2 : 0) +
+                                                    (test_bit(WriteMostly, &rs->dev[i].rdev.flags) ? 2 : 0);
+               }
+               rebuild_writemostly_count -= (test_bit(__CTR_FLAG_REBUILD, &rs->ctr_flags) ? 2 : 0) +
+                                            (test_bit(__CTR_FLAG_WRITE_MOSTLY, &rs->ctr_flags) ? 2 : 0);
+               /* Calculate raid parameter count based on ^ rebuild/writemostly argument counts and ctr flags set. */
+               raid_param_cnt += rebuild_writemostly_count +
                                  hweight32(rs->ctr_flags & CTR_FLAG_OPTIONS_NO_ARGS) +
-                                 hweight32(rs->ctr_flags & CTR_FLAG_OPTIONS_ONE_ARG) * 2 +
-                                 (test_bit(__CTR_FLAG_JOURNAL_DEV, &rs->ctr_flags) ? 2 : 0) +
-                                 (test_bit(__CTR_FLAG_JOURNAL_MODE, &rs->ctr_flags) ? 2 : 0);
-
+                                 hweight32(rs->ctr_flags & CTR_FLAG_OPTIONS_ONE_ARG) * 2;
                /* Emit table line */
                /* This has to be in the documented order for userspace! */
                DMEMIT("%s %u %u", rs->raid_type->name, raid_param_cnt, mddev->new_chunk_sectors);
@@ -3612,11 +3614,10 @@ static void raid_status(struct dm_target *ti, status_type_t type,
                        DMEMIT(" %s", dm_raid_arg_name_by_flag(CTR_FLAG_SYNC));
                if (test_bit(__CTR_FLAG_NOSYNC, &rs->ctr_flags))
                        DMEMIT(" %s", dm_raid_arg_name_by_flag(CTR_FLAG_NOSYNC));
-               if (rebuild_disks)
+               if (test_bit(__CTR_FLAG_REBUILD, &rs->ctr_flags))
                        for (i = 0; i < rs->raid_disks; i++)
-                               if (test_bit(rs->dev[i].rdev.raid_disk, (void *) rs->rebuild_disks))
-                                       DMEMIT(" %s %u", dm_raid_arg_name_by_flag(CTR_FLAG_REBUILD),
-                                                        rs->dev[i].rdev.raid_disk);
+                               if (test_bit(i, (void *) rs->rebuild_disks))
+                                       DMEMIT(" %s %u", dm_raid_arg_name_by_flag(CTR_FLAG_REBUILD), i);
                if (test_bit(__CTR_FLAG_DAEMON_SLEEP, &rs->ctr_flags))
                        DMEMIT(" %s %lu", dm_raid_arg_name_by_flag(CTR_FLAG_DAEMON_SLEEP),
                                          mddev->bitmap_info.daemon_sleep);
@@ -3626,7 +3627,7 @@ static void raid_status(struct dm_target *ti, status_type_t type,
                if (test_bit(__CTR_FLAG_MAX_RECOVERY_RATE, &rs->ctr_flags))
                        DMEMIT(" %s %d", dm_raid_arg_name_by_flag(CTR_FLAG_MAX_RECOVERY_RATE),
                                         mddev->sync_speed_max);
-               if (write_mostly_params)
+               if (test_bit(__CTR_FLAG_WRITE_MOSTLY, &rs->ctr_flags))
                        for (i = 0; i < rs->raid_disks; i++)
                                if (test_bit(WriteMostly, &rs->dev[i].rdev.flags))
                                        DMEMIT(" %s %d", dm_raid_arg_name_by_flag(CTR_FLAG_WRITE_MOSTLY),
@@ -4029,7 +4030,7 @@ static void raid_resume(struct dm_target *ti)
 
 static struct target_type raid_target = {
        .name = "raid",
-       .version = {1, 15, 0},
+       .version = {1, 15, 1},
        .module = THIS_MODULE,
        .ctr = raid_ctr,
        .dtr = raid_dtr,