Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87968ddd authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Alasdair G Kergon
Browse files

dm raid1: abstract get_valid_mirror function 



Move the logic to get a valid mirror leg into a function for re-use
in a later patch.

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Reviewed-by: default avatarTakahiro Yasui <tyasui@redhat.com>
Tested-by: default avatarTakahiro Yasui <tyasui@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent 0f398a84

drivers/md/dm-raid1.c

+15 −7
Original line number Diff line number Diff line
@@ -181,6 +181,17 @@ static void set_default_mirror(struct mirror *m) 
	atomic_set(&ms->default_mirror, m - m0);

}



static struct mirror *get_valid_mirror(struct mirror_set *ms)

{

	struct mirror *m;



	for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)

		if (!atomic_read(&m->error_count))

			return m;



	return NULL;

}



/* fail_mirror

 * @m: mirror device to fail

 * @error_type: one of the enum's, DM_RAID1_*_ERROR
@@ -226,13 +237,10 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type) 
		goto out;

	}



	for (new = ms->mirror; new < ms->mirror + ms->nr_mirrors; new++)

		if (!atomic_read(&new->error_count)) {

	new = get_valid_mirror(ms);

	if (new)

		set_default_mirror(new);

			break;

		}



	if (unlikely(new == ms->mirror + ms->nr_mirrors))

	else

		DMWARN("All sides of mirror have failed.");



out: