--- drivers/md/raid1.c

+++ drivers/md/raid1.c

@@ -417,7 +417,7 @@ static void raid1_end_write_request(stru

*/

static int read_balance(conf_t *conf, r1bio_t *r1_bio)

{

- const unsigned long 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;

@@ -433,7 +433,7 @@ static int read_balance(conf_t *conf, r1

retry:

if (conf->mddev->recovery_cp < MaxSector &&

(this_sector + sectors >= conf->next_resync)) {

- /* Choose the first operation device, for consistancy */

+ /* Choose the first operational device, for consistancy */

new_disk = 0;

for (rdev = rcu_dereference(conf->mirrors[new_disk].rdev);

@@ -891,9 +891,10 @@ static int make_request(struct request_q

if (test_bit(Faulty, &rdev->flags)) {

rdev_dec_pending(rdev, mddev);

r1_bio->bios[i] = NULL;

- } else

+ } else {

r1_bio->bios[i] = bio;

- targets++;

+ targets++;

+ }

} else

r1_bio->bios[i] = NULL;

}