From 24ac84094e7e61cb15ed894d15931c035d8eb404 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Sat, 8 May 2010 08:20:17 +1000 Subject: [PATCH] --- yaml --- r: 197508 b: refs/heads/master c: af3a2cd6b8a479345786e7fe5e199ad2f6240e56 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/raid1.c | 4 ++-- trunk/drivers/md/raid10.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ee8be4a7b17a..6e110267ca8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2dc40f80945ac3e5ec05c3a6c75baf09b13cee51 +refs/heads/master: af3a2cd6b8a479345786e7fe5e199ad2f6240e56 diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c index 1db02c4955a9..a9b9972ff703 100644 --- a/trunk/drivers/md/raid1.c +++ b/trunk/drivers/md/raid1.c @@ -418,7 +418,7 @@ static void raid1_end_write_request(struct bio *bio, int error) */ 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; @@ -434,7 +434,7 @@ static int read_balance(conf_t *conf, r1bio_t *r1_bio) 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); diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c index e0742c439484..a1f5fd2d69ce 100644 --- a/trunk/drivers/md/raid10.c +++ b/trunk/drivers/md/raid10.c @@ -495,7 +495,7 @@ static int raid10_mergeable_bvec(struct request_queue *q, */ static int read_balance(conf_t *conf, r10bio_t *r10_bio) { - const unsigned long this_sector = r10_bio->sector; + const sector_t this_sector = r10_bio->sector; int disk, slot, nslot; const int sectors = r10_bio->sectors; sector_t new_distance, current_distance;