diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 11:06:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-02 11:06:02 -0500 |
| commit | ec1890c5df451799dec969a3581ff72e1934b5ee (patch) | |
| tree | 38e84a95297dc9c6b727b73925d5c273d110fdbe /drivers/md/md.c | |
| parent | ca23509fbaac0ea662ab0e287bebb72f743f9e1f (diff) | |
| parent | 496456c24f1f4280d50b81aa5bf439ab440b3d7e (diff) | |
Merge git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 2a8a5696bf8a..9ecf51ee596f 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -3466,8 +3466,8 @@ static int is_mddev_idle(mddev_t *mddev) | |||
| 3466 | idle = 1; | 3466 | idle = 1; |
| 3467 | ITERATE_RDEV(mddev,rdev,tmp) { | 3467 | ITERATE_RDEV(mddev,rdev,tmp) { |
| 3468 | struct gendisk *disk = rdev->bdev->bd_contains->bd_disk; | 3468 | struct gendisk *disk = rdev->bdev->bd_contains->bd_disk; |
| 3469 | curr_events = disk_stat_read(disk, read_sectors) + | 3469 | curr_events = disk_stat_read(disk, sectors[0]) + |
| 3470 | disk_stat_read(disk, write_sectors) - | 3470 | disk_stat_read(disk, sectors[1]) - |
| 3471 | atomic_read(&disk->sync_io); | 3471 | atomic_read(&disk->sync_io); |
| 3472 | /* Allow some slack between valud of curr_events and last_events, | 3472 | /* Allow some slack between valud of curr_events and last_events, |
| 3473 | * as there are some uninteresting races. | 3473 | * as there are some uninteresting races. |