diff options
| -rw-r--r-- | drivers/md/raid5.c | 10 | ||||
| -rw-r--r-- | include/linux/raid/raid5.h | 2 |
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 8c4e6149daea..60e61d2464b5 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
| @@ -837,15 +837,10 @@ ops_run_postxor(struct stripe_head *sh, struct dma_async_tx_descriptor *tx, | |||
| 837 | static void ops_complete_check(void *stripe_head_ref) | 837 | static void ops_complete_check(void *stripe_head_ref) |
| 838 | { | 838 | { |
| 839 | struct stripe_head *sh = stripe_head_ref; | 839 | struct stripe_head *sh = stripe_head_ref; |
| 840 | int pd_idx = sh->pd_idx; | ||
| 841 | 840 | ||
| 842 | pr_debug("%s: stripe %llu\n", __func__, | 841 | pr_debug("%s: stripe %llu\n", __func__, |
| 843 | (unsigned long long)sh->sector); | 842 | (unsigned long long)sh->sector); |
| 844 | 843 | ||
| 845 | if (test_and_clear_bit(STRIPE_OP_MOD_DMA_CHECK, &sh->ops.pending) && | ||
| 846 | sh->ops.zero_sum_result == 0) | ||
| 847 | set_bit(R5_UPTODATE, &sh->dev[pd_idx].flags); | ||
| 848 | |||
| 849 | set_bit(STRIPE_OP_CHECK, &sh->ops.complete); | 844 | set_bit(STRIPE_OP_CHECK, &sh->ops.complete); |
| 850 | set_bit(STRIPE_HANDLE, &sh->state); | 845 | set_bit(STRIPE_HANDLE, &sh->state); |
| 851 | release_stripe(sh); | 846 | release_stripe(sh); |
| @@ -873,11 +868,6 @@ static void ops_run_check(struct stripe_head *sh) | |||
| 873 | tx = async_xor_zero_sum(xor_dest, xor_srcs, 0, count, STRIPE_SIZE, | 868 | tx = async_xor_zero_sum(xor_dest, xor_srcs, 0, count, STRIPE_SIZE, |
| 874 | &sh->ops.zero_sum_result, 0, NULL, NULL, NULL); | 869 | &sh->ops.zero_sum_result, 0, NULL, NULL, NULL); |
| 875 | 870 | ||
| 876 | if (tx) | ||
| 877 | set_bit(STRIPE_OP_MOD_DMA_CHECK, &sh->ops.pending); | ||
| 878 | else | ||
| 879 | clear_bit(STRIPE_OP_MOD_DMA_CHECK, &sh->ops.pending); | ||
| 880 | |||
| 881 | atomic_inc(&sh->count); | 871 | atomic_inc(&sh->count); |
| 882 | tx = async_trigger_callback(ASYNC_TX_DEP_ACK | ASYNC_TX_ACK, tx, | 872 | tx = async_trigger_callback(ASYNC_TX_DEP_ACK | ASYNC_TX_ACK, tx, |
| 883 | ops_complete_check, sh); | 873 | ops_complete_check, sh); |
diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h index f0827d31ae6f..4ecae31a3dcb 100644 --- a/include/linux/raid/raid5.h +++ b/include/linux/raid/raid5.h | |||
| @@ -267,10 +267,8 @@ struct r6_state { | |||
| 267 | 267 | ||
| 268 | /* modifiers to the base operations | 268 | /* modifiers to the base operations |
| 269 | * STRIPE_OP_MOD_REPAIR_PD - compute the parity block and write it back | 269 | * STRIPE_OP_MOD_REPAIR_PD - compute the parity block and write it back |
| 270 | * STRIPE_OP_MOD_DMA_CHECK - parity is not corrupted by the check | ||
| 271 | */ | 270 | */ |
| 272 | #define STRIPE_OP_MOD_REPAIR_PD 7 | 271 | #define STRIPE_OP_MOD_REPAIR_PD 7 |
| 273 | #define STRIPE_OP_MOD_DMA_CHECK 8 | ||
| 274 | 272 | ||
| 275 | /* | 273 | /* |
| 276 | * Plugging: | 274 | * Plugging: |
