Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

md: tidy up device searches in read_balance.

Browse source 
The code for searching through the device list to read-balance in
raid1 is rather clumsy and hard to follow.  Try to simplify it a bit.

No important functionality change here.


Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2010-09-06 14:10:08 +10:00
parent 046abeede7
commit f3ac8bf7ce
1 changed files with 34 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
drivers/md/raid1.c
View file

@ -419,11 +419,13 @@ static void raid1_end_write_request(struct bio *bio, int error)
static int read_balance(conf_t *conf, r1bio_t *r1_bio) static int read_balance(conf_t *conf, r1bio_t *r1_bio)
{ {
const sector_t this_sector = r1_bio->sector; const sector_t this_sector = r1_bio->sector;
int new_disk = conf->last_used, disk = new_disk;
int wonly_disk = -1;
const int sectors = r1_bio->sectors; const int sectors = r1_bio->sectors;
int new_disk = -1;
int start_disk;
int i;
sector_t new_distance, current_distance; sector_t new_distance, current_distance;
mdk_rdev_t *rdev; mdk_rdev_t *rdev;
int choose_first;
rcu_read_lock(); rcu_read_lock();
/* /*
@ -434,54 +436,33 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio)
retry: retry:
if (conf->mddev->recovery_cp < MaxSector && if (conf->mddev->recovery_cp < MaxSector &&
(this_sector + sectors >= conf->next_resync)) { (this_sector + sectors >= conf->next_resync)) {
/* Choose the first operational device, for consistancy */ choose_first = 1;
new_disk = 0; start_disk = 0;
} else {
for (rdev = rcu_dereference(conf->mirrors[new_disk].rdev); choose_first = 0;
r1_bio->bios[new_disk] == IO_BLOCKED || start_disk = conf->last_used;
!rdev || !test_bit(In_sync, &rdev->flags)
|| test_bit(WriteMostly, &rdev->flags);
rdev = rcu_dereference(conf->mirrors[++new_disk].rdev)) {
if (rdev && test_bit(In_sync, &rdev->flags) &&
r1_bio->bios[new_disk] != IO_BLOCKED)
wonly_disk = new_disk;
if (new_disk == conf->raid_disks - 1) {
new_disk = wonly_disk;
break;
}
}
goto rb_out;
} }
/* make sure the disk is operational */ /* make sure the disk is operational */
for (rdev = rcu_dereference(conf->mirrors[new_disk].rdev); for (i = 0 ; i < conf->raid_disks ; i++) {
r1_bio->bios[new_disk] == IO_BLOCKED || int disk = start_disk + i;
!rdev || !test_bit(In_sync, &rdev->flags) || if (disk >= conf->raid_disks)
test_bit(WriteMostly, &rdev->flags); disk -= conf->raid_disks;
rdev = rcu_dereference(conf->mirrors[new_disk].rdev)) {
if (rdev && test_bit(In_sync, &rdev->flags) && rdev = rcu_dereference(conf->mirrors[disk].rdev);
r1_bio->bios[new_disk] != IO_BLOCKED) if (r1_bio->bios[disk] == IO_BLOCKED
wonly_disk = new_disk; || rdev == NULL
|| !test_bit(In_sync, &rdev->flags))
continue;
if (new_disk <= 0) new_disk = disk;
new_disk = conf->raid_disks; if (!test_bit(WriteMostly, &rdev->flags))
new_disk--;
if (new_disk == disk) {
new_disk = wonly_disk;
break; break;
}
} }
if (new_disk < 0) if (new_disk < 0 || choose_first)
goto rb_out; goto rb_out;
disk = new_disk;
/* now disk == new_disk == starting point for search */
/* /*
* Don't change to another disk for sequential reads: * Don't change to another disk for sequential reads:
*/ */
@ -490,20 +471,21 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio)
if (this_sector == conf->mirrors[new_disk].head_position) if (this_sector == conf->mirrors[new_disk].head_position)
goto rb_out; goto rb_out;
current_distance = abs(this_sector - conf->mirrors[disk].head_position); current_distance = abs(this_sector
- conf->mirrors[new_disk].head_position);
/* Find the disk whose head is closest */ /* look for a better disk - i.e. head is closer */
start_disk = new_disk;
do { for (i = 1; i < conf->raid_disks; i++) {
if (disk <= 0) int disk = start_disk + 1;
disk = conf->raid_disks; if (disk >= conf->raid_disks)
disk--; disk -= conf->raid_disks;
rdev = rcu_dereference(conf->mirrors[disk].rdev); rdev = rcu_dereference(conf->mirrors[disk].rdev);
if (r1_bio->bios[disk] == IO_BLOCKED
if (!rdev || r1_bio->bios[disk] == IO_BLOCKED || || rdev == NULL
!test_bit(In_sync, &rdev->flags) || || !test_bit(In_sync, &rdev->flags)
test_bit(WriteMostly, &rdev->flags)) || test_bit(WriteMostly, &rdev->flags))
continue; continue;
if (!atomic_read(&rdev->nr_pending)) { if (!atomic_read(&rdev->nr_pending)) {
@ -515,11 +497,9 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio)
current_distance = new_distance; current_distance = new_distance;
new_disk = disk; new_disk = disk;
} }
} while (disk != conf->last_used); }
rb_out: rb_out:
if (new_disk >= 0) { if (new_disk >= 0) {
rdev = rcu_dereference(conf->mirrors[new_disk].rdev); rdev = rcu_dereference(conf->mirrors[new_disk].rdev);
if (!rdev) if (!rdev)