Commit ad51d7f1 authored by Heinz Mauelshagen's avatar Heinz Mauelshagen Committed by Mike Snitzer
Browse files

dm raid: more use of flag testing wrappers 



 - add _test_flags() function

 - use it to simplify rs_check_for_invalid_flags()

 - use _test_flag() throughout

Signed-off-by: default avatarHeinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent f090279e

drivers/md/dm-raid.c

+23 −25
Original line number Diff line number Diff line
@@ -175,6 +175,12 @@ static bool _test_flag(uint32_t flag, uint32_t flags) 
	return (flag & flags) ? true : false;

}



/* Test multiple @flags in @all_flags */

static bool _test_flags(uint32_t flags, uint32_t all_flags)

{

	return (flags & all_flags) ? true : false;

}



/* Return true if single @flag is set in @*flags, else set it and return false */

static bool _test_and_set_flag(uint32_t flag, uint32_t *flags)

{
@@ -296,16 +302,8 @@ static uint32_t _invalid_flags(struct raid_set *rs) 
 */

static int rs_check_for_invalid_flags(struct raid_set *rs)

{

	unsigned int ctr_flags = rs->ctr_flags, flag = 0;

	const uint32_t invalid_flags = _invalid_flags(rs);



	while ((ctr_flags &= ~flag)) {

		flag = 1 << __ffs(ctr_flags);



		if (_test_flag(flag, rs->ctr_flags) &&

		    _test_flag(flag, invalid_flags))

	if (_test_flags(rs->ctr_flags, _invalid_flags(rs)))

		return ti_error_einval(rs->ti, "Invalid flag combined");

	}



	return 0;

}
@@ -1150,7 +1148,7 @@ static int super_init_validation(struct mddev *mddev, struct md_rdev *rdev) 
		return -EINVAL;

	}



	if (!(rs->ctr_flags & (CTR_FLAG_SYNC | CTR_FLAG_NOSYNC)))

	if (!(_test_flags(CTR_FLAGS_ANY_SYNC, rs->ctr_flags)))

		mddev->recovery_cp = le64_to_cpu(sb->array_resync_offset);



	/*
@@ -1293,7 +1291,7 @@ static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs) 
		 */

		rdev->sectors = to_sector(i_size_read(rdev->bdev->bd_inode));



		if (rs->ctr_flags & CTR_FLAG_SYNC)

		if (_test_flag(CTR_FLAG_SYNC, rs->ctr_flags))

			continue;



		if (!rdev->meta_bdev)
@@ -1650,7 +1648,7 @@ static void raid_status(struct dm_target *ti, status_type_t type, 
	case STATUSTYPE_TABLE:

		/* The string you would use to construct this array */

		for (i = 0; i < rs->md.raid_disks; i++) {

			if ((rs->ctr_flags & CTR_FLAG_REBUILD) &&

			if (_test_flag(CTR_FLAG_REBUILD, rs->ctr_flags) &&

			    rs->dev[i].data_dev &&

			    !test_bit(In_sync, &rs->dev[i].rdev.flags))

				raid_param_cnt += 2; /* for rebuilds */
@@ -1666,26 +1664,26 @@ static void raid_status(struct dm_target *ti, status_type_t type, 
		DMEMIT("%s %u %u", rs->raid_type->name,

		       raid_param_cnt, rs->md.chunk_sectors);



		if ((rs->ctr_flags & CTR_FLAG_SYNC) &&

		    (rs->md.recovery_cp == MaxSector))

		if (_test_flag(CTR_FLAG_SYNC, rs->ctr_flags) &&

		    rs->md.recovery_cp == MaxSector)

			DMEMIT(" sync");

		if (rs->ctr_flags & CTR_FLAG_NOSYNC)

		if (_test_flag(CTR_FLAG_NOSYNC, rs->ctr_flags))

			DMEMIT(" nosync");



		for (i = 0; i < rs->md.raid_disks; i++)

			if ((rs->ctr_flags & CTR_FLAG_REBUILD) &&

			if (_test_flag(CTR_FLAG_REBUILD, rs->ctr_flags) &&

			    rs->dev[i].data_dev &&

			    !test_bit(In_sync, &rs->dev[i].rdev.flags))

				DMEMIT(" rebuild %u", i);



		if (rs->ctr_flags & CTR_FLAG_DAEMON_SLEEP)

		if (_test_flag(CTR_FLAG_DAEMON_SLEEP, rs->ctr_flags))

			DMEMIT(" daemon_sleep %lu",

			       rs->md.bitmap_info.daemon_sleep);



		if (rs->ctr_flags & CTR_FLAG_MIN_RECOVERY_RATE)

		if (_test_flag(CTR_FLAG_MIN_RECOVERY_RATE, rs->ctr_flags))

			DMEMIT(" min_recovery_rate %d", rs->md.sync_speed_min);



		if (rs->ctr_flags & CTR_FLAG_MAX_RECOVERY_RATE)

		if (_test_flag(CTR_FLAG_MAX_RECOVERY_RATE, rs->ctr_flags))

			DMEMIT(" max_recovery_rate %d", rs->md.sync_speed_max);



		for (i = 0; i < rs->md.raid_disks; i++)
@@ -1693,11 +1691,11 @@ static void raid_status(struct dm_target *ti, status_type_t type, 
			    test_bit(WriteMostly, &rs->dev[i].rdev.flags))

				DMEMIT(" write_mostly %u", i);



		if (rs->ctr_flags & CTR_FLAG_MAX_WRITE_BEHIND)

		if (_test_flag(CTR_FLAG_MAX_WRITE_BEHIND, rs->ctr_flags))

			DMEMIT(" max_write_behind %lu",

			       rs->md.bitmap_info.max_write_behind);



		if (rs->ctr_flags & CTR_FLAG_STRIPE_CACHE) {

		if (_test_flag(CTR_FLAG_STRIPE_CACHE, rs->ctr_flags)) {

			struct r5conf *conf = rs->md.private;



			/* convert from kiB to sectors */
@@ -1705,15 +1703,15 @@ static void raid_status(struct dm_target *ti, status_type_t type, 
			       conf ? conf->max_nr_stripes * 2 : 0);

		}



		if (rs->ctr_flags & CTR_FLAG_REGION_SIZE)

		if (_test_flag(CTR_FLAG_REGION_SIZE, rs->ctr_flags))

			DMEMIT(" region_size %lu",

			       rs->md.bitmap_info.chunksize >> 9);



		if (rs->ctr_flags & CTR_FLAG_RAID10_COPIES)

		if (_test_flag(CTR_FLAG_RAID10_COPIES, rs->ctr_flags))

			DMEMIT(" raid10_copies %u",

			       raid10_md_layout_to_copies(rs->md.layout));



		if (rs->ctr_flags & CTR_FLAG_RAID10_FORMAT)

		if (_test_flag(CTR_FLAG_RAID10_FORMAT, rs->ctr_flags))

			DMEMIT(" raid10_format %s",

			       raid10_md_layout_to_format(rs->md.layout));