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

Commit 2c4193df authored by Namhyung Kim's avatar Namhyung Kim Committed by NeilBrown
Browse files

md/raid10: get rid of duplicated conditional expression 



Variable 'first' is initialized to zero and updated to @rdev->raid_disk
only if it is greater than 0. Thus condition '>= first' always implies
'>= 0' so the latter is not needed.

Signed-off-by: default avatarNamhyung Kim <namhyung@gmail.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 1765a367

drivers/md/raid10.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1093,8 +1093,7 @@ static int raid10_add_disk(mddev_t *mddev, mdk_rdev_t *rdev) 
	if (rdev->raid_disk >= 0)

	if (rdev->raid_disk >= 0)

		first = last = rdev->raid_disk;

		first = last = rdev->raid_disk;





	if (rdev->saved_raid_disk >= 0 &&

	if (rdev->saved_raid_disk >= first &&

	    rdev->saved_raid_disk >= first &&

	    conf->mirrors[rdev->saved_raid_disk].rdev == NULL)

	    conf->mirrors[rdev->saved_raid_disk].rdev == NULL)

		mirror = rdev->saved_raid_disk;

		mirror = rdev->saved_raid_disk;

	else

	else