diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /drivers/md/raid1.c | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index dc9d2def0270..656fae912fe3 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
| @@ -1474,8 +1474,8 @@ static void fix_read_error(conf_t *conf, int read_disk, | |||
| 1474 | "raid1:%s: read error corrected " | 1474 | "raid1:%s: read error corrected " |
| 1475 | "(%d sectors at %llu on %s)\n", | 1475 | "(%d sectors at %llu on %s)\n", |
| 1476 | mdname(mddev), s, | 1476 | mdname(mddev), s, |
| 1477 | (unsigned long long)sect + | 1477 | (unsigned long long)(sect + |
| 1478 | rdev->data_offset, | 1478 | rdev->data_offset), |
| 1479 | bdevname(rdev->bdev, b)); | 1479 | bdevname(rdev->bdev, b)); |
| 1480 | } | 1480 | } |
| 1481 | } | 1481 | } |