diff --git a/[refs] b/[refs] index fc9bc26d4042..eea7184a9a69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8830bcaf3206f15e29efcd9e04becd96a0722e9 +refs/heads/master: f17ed07c853d5d772515f565a7fc68f9098d6d69 diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c index 80cc7e63cdb7..f44a3da5a80d 100644 --- a/trunk/drivers/md/raid10.c +++ b/trunk/drivers/md/raid10.c @@ -1742,7 +1742,6 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i r10bio_t *r10_bio; struct bio *biolist = NULL, *bio; sector_t max_sector, nr_sectors; - int disk; int i; int max_sync; sector_t sync_blocks; @@ -2020,7 +2019,6 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i do { struct page *page; int len = PAGE_SIZE; - disk = 0; if (sector_nr + (len>>9) > max_sector) len = (max_sector - sector_nr) << 9; if (len == 0) @@ -2039,7 +2037,6 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i } goto bio_full; } - disk = i; } nr_sectors += len>>9; sector_nr += len>>9;