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

Commit 54726f14 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://neil.brown.name/md 

* 'for-linus' of git://neil.brown.name/md:
  md: raid5: change incorrect usage of 'min' macro to 'min_t'
parents 8784cdd9 ed37d83e

drivers/md/raid5.c

+3 −3
Original line number Diff line number Diff line
@@ -3811,13 +3811,13 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped 
	safepos = conf->reshape_safe;

	sector_div(safepos, data_disks);

	if (mddev->delta_disks < 0) {

		writepos -= min(reshape_sectors, writepos);

		writepos -= min_t(sector_t, reshape_sectors, writepos);

		readpos += reshape_sectors;

		safepos += reshape_sectors;

	} else {

		writepos += reshape_sectors;

		readpos -= min(reshape_sectors, readpos);

		safepos -= min(reshape_sectors, safepos);

		readpos -= min_t(sector_t, reshape_sectors, readpos);

		safepos -= min_t(sector_t, reshape_sectors, safepos);

	}



	/* 'writepos' is the most advanced device address we might write.