summaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2009-09-16 12:24:54 -0700
committerDan Williams <dan.j.williams@intel.com>2009-09-16 12:24:54 -0700
commit6c910a78e495b4c1778a8b136b37fe3c05712730 (patch)
tree46bb72265a9ea354e1bb6b043318e93dbf07df5e /drivers/md
parent2d6e4ecc87d20299bcb249dd62efbd73496744c3 (diff)
downloadop-kernel-dev-6c910a78e495b4c1778a8b136b37fe3c05712730.zip
op-kernel-dev-6c910a78e495b4c1778a8b136b37fe3c05712730.tar.gz
md/raid6: cleanup ops_run_compute6_2
Neil says: "It is correct as it stands, but the fact that every branch in the 'if' part ends with a 'return' isn't immediately obvious, so it is clearer if we are explicit about the if / then / else structure." Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/raid5.c27
1 files changed, 15 insertions, 12 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 0a5f03d..1898eda 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -810,7 +810,7 @@ ops_run_compute6_2(struct stripe_head *sh, struct raid5_percpu *percpu)
BUG_ON(!test_bit(R5_Wantcompute, &tgt->flags));
BUG_ON(!test_bit(R5_Wantcompute, &tgt2->flags));
- /* we need to open-code set_syndrome_sources to handle to the
+ /* we need to open-code set_syndrome_sources to handle the
* slot number conversion for 'faila' and 'failb'
*/
for (i = 0; i < disks ; i++)
@@ -879,18 +879,21 @@ ops_run_compute6_2(struct stripe_head *sh, struct raid5_percpu *percpu)
return async_gen_syndrome(blocks, 0, count+2,
STRIPE_SIZE, &submit);
}
- }
-
- init_async_submit(&submit, ASYNC_TX_FENCE, NULL, ops_complete_compute,
- sh, to_addr_conv(sh, percpu));
- if (failb == syndrome_disks) {
- /* We're missing D+P. */
- return async_raid6_datap_recov(syndrome_disks+2, STRIPE_SIZE,
- faila, blocks, &submit);
} else {
- /* We're missing D+D. */
- return async_raid6_2data_recov(syndrome_disks+2, STRIPE_SIZE,
- faila, failb, blocks, &submit);
+ init_async_submit(&submit, ASYNC_TX_FENCE, NULL,
+ ops_complete_compute, sh,
+ to_addr_conv(sh, percpu));
+ if (failb == syndrome_disks) {
+ /* We're missing D+P. */
+ return async_raid6_datap_recov(syndrome_disks+2,
+ STRIPE_SIZE, faila,
+ blocks, &submit);
+ } else {
+ /* We're missing D+D. */
+ return async_raid6_2data_recov(syndrome_disks+2,
+ STRIPE_SIZE, faila, failb,
+ blocks, &submit);
+ }
}
}
OpenPOWER on IntegriCloud