diff options
author | Dan Williams <dan.j.williams@intel.com> | 2008-06-27 18:32:05 -0400 |
---|---|---|
committer | Neil Brown <neilb@notabene.brown> | 2008-06-27 18:32:05 -0400 |
commit | 600aa10993012ff2dd5617720dac081e4f992017 (patch) | |
tree | ead3e928aaa45e68bc65ea9aedc513c5b9c3d2d6 /include/linux/raid | |
parent | 976ea8d475675da6e86bd434328814ccbf5ae641 (diff) |
md: replace STRIPE_OP_{BIODRAIN,PREXOR,POSTXOR} with 'reconstruct_states'
From: Dan Williams <dan.j.williams@intel.com>
Track the state of reconstruct operations (recalculating the parity block
usually due to incoming writes, or as part of array expansion) Reduces the
scope of the STRIPE_OP_{BIODRAIN,PREXOR,POSTXOR} flags to only tracking whether
a reconstruct operation has been requested via the ops_request field of struct
stripe_head_state.
This is the final step in the removal of ops.{pending,ack,complete,count}, i.e.
the STRIPE_OP_{BIODRAIN,PREXOR,POSTXOR} flags only request an operation and do
not track the state of the operation.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Diffstat (limited to 'include/linux/raid')
-rw-r--r-- | include/linux/raid/raid5.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h index 2c96d5fd54bf..5f3e674b87dd 100644 --- a/include/linux/raid/raid5.h +++ b/include/linux/raid/raid5.h | |||
@@ -205,19 +205,12 @@ struct stripe_head { | |||
205 | int bm_seq; /* sequence number for bitmap flushes */ | 205 | int bm_seq; /* sequence number for bitmap flushes */ |
206 | int disks; /* disks in stripe */ | 206 | int disks; /* disks in stripe */ |
207 | enum check_states check_state; | 207 | enum check_states check_state; |
208 | enum reconstruct_states reconstruct_state; | ||
208 | /* stripe_operations | 209 | /* stripe_operations |
209 | * @pending - pending ops flags (set for request->issue->complete) | ||
210 | * @ack - submitted ops flags (set for issue->complete) | ||
211 | * @complete - completed ops flags (set for complete) | ||
212 | * @target - STRIPE_OP_COMPUTE_BLK target | 210 | * @target - STRIPE_OP_COMPUTE_BLK target |
213 | * @count - raid5_runs_ops is set to run when this is non-zero | ||
214 | */ | 211 | */ |
215 | struct stripe_operations { | 212 | struct stripe_operations { |
216 | unsigned long pending; | ||
217 | unsigned long ack; | ||
218 | unsigned long complete; | ||
219 | int target; | 213 | int target; |
220 | int count; | ||
221 | u32 zero_sum_result; | 214 | u32 zero_sum_result; |
222 | } ops; | 215 | } ops; |
223 | struct r5dev { | 216 | struct r5dev { |