diff options
| author | David S. Miller | 2012-04-13 01:41:23 +0200 |
|---|---|---|
| committer | David S. Miller | 2012-04-13 01:41:23 +0200 |
| commit | 011e3c63251be832d23df9f0697626ab7b354d02 (patch) | |
| tree | 2cad5b58c274c93ae49d9b58fb15d784d4dfd78f /drivers/md/raid10.c | |
| parent | net/ipv6/exthdrs.c: Strict PadN option checking (diff) | |
| parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
| download | kernel-qcow2-linux-011e3c63251be832d23df9f0697626ab7b354d02.tar.gz kernel-qcow2-linux-011e3c63251be832d23df9f0697626ab7b354d02.tar.xz kernel-qcow2-linux-011e3c63251be832d23df9f0697626ab7b354d02.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/md/raid10.c')
| -rw-r--r-- | drivers/md/raid10.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index fff782189e48..c8dbb84d5357 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -1788,6 +1788,7 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio) struct r10conf *conf = mddev->private; int i, first; struct bio *tbio, *fbio; + int vcnt; atomic_set(&r10_bio->remaining, 1); @@ -1802,10 +1803,10 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio) first = i; fbio = r10_bio->devs[i].bio; + vcnt = (r10_bio->sectors + (PAGE_SIZE >> 9) - 1) >> (PAGE_SHIFT - 9); /* now find blocks with errors */ for (i=0 ; i < conf->copies ; i++) { int j, d; - int vcnt = r10_bio->sectors >> (PAGE_SHIFT-9); tbio = r10_bio->devs[i].bio; @@ -1871,7 +1872,6 @@ static void sync_request_write(struct mddev *mddev, struct r10bio *r10_bio) */ for (i = 0; i < conf->copies; i++) { int j, d; - int vcnt = r10_bio->sectors >> (PAGE_SHIFT-9); tbio = r10_bio->devs[i].repl_bio; if (!tbio || !tbio->bi_end_io) |