diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/md/md.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 8b66e04c2ea..b12b3776c0c 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -6266,7 +6266,7 @@ static void status_resync(struct seq_file *seq, mddev_t * mddev) | |||
| 6266 | * rt is a sector_t, so could be 32bit or 64bit. | 6266 | * rt is a sector_t, so could be 32bit or 64bit. |
| 6267 | * So we divide before multiply in case it is 32bit and close | 6267 | * So we divide before multiply in case it is 32bit and close |
| 6268 | * to the limit. | 6268 | * to the limit. |
| 6269 | * We scale the divisor (db) by 32 to avoid loosing precision | 6269 | * We scale the divisor (db) by 32 to avoid losing precision |
| 6270 | * near the end of resync when the number of remaining sectors | 6270 | * near the end of resync when the number of remaining sectors |
| 6271 | * is close to 'db'. | 6271 | * is close to 'db'. |
| 6272 | * We then divide rt by 32 after multiplying by db to compensate. | 6272 | * We then divide rt by 32 after multiplying by db to compensate. |