diff options
author | Dan Williams <dan.j.williams@intel.com> | 2008-06-27 18:32:06 -0400 |
---|---|---|
committer | Neil Brown <neilb@notabene.brown> | 2008-06-27 18:32:06 -0400 |
commit | d8ee0728b5b30d7a6f62c399a95e953616d31f23 (patch) | |
tree | 7f9fcf2b0f6222b2a2b8ee44d69af1fd6990064d /include | |
parent | 600aa10993012ff2dd5617720dac081e4f992017 (diff) |
md: replace R5_WantPrexor with R5_WantDrain, add 'prexor' reconstruct_states
From: Dan Williams <dan.j.williams@intel.com>
Currently ops_run_biodrain and other locations have extra logic to determine
which blocks are processed in the prexor and non-prexor cases. This can be
eliminated if handle_write_operations5 flags the blocks to be processed in all
cases via R5_Wantdrain. The presence of the prexor operation is tracked in
sh->reconstruct_state.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/raid/raid5.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h index 5f3e674b87dd..3b2672792457 100644 --- a/include/linux/raid/raid5.h +++ b/include/linux/raid/raid5.h | |||
@@ -187,8 +187,10 @@ enum check_states { | |||
187 | */ | 187 | */ |
188 | enum reconstruct_states { | 188 | enum reconstruct_states { |
189 | reconstruct_state_idle = 0, | 189 | reconstruct_state_idle = 0, |
190 | reconstruct_state_prexor_drain_run, /* prexor-write */ | ||
190 | reconstruct_state_drain_run, /* write */ | 191 | reconstruct_state_drain_run, /* write */ |
191 | reconstruct_state_run, /* expand */ | 192 | reconstruct_state_run, /* expand */ |
193 | reconstruct_state_prexor_drain_result, | ||
192 | reconstruct_state_drain_result, | 194 | reconstruct_state_drain_result, |
193 | reconstruct_state_result, | 195 | reconstruct_state_result, |
194 | }; | 196 | }; |
@@ -258,9 +260,7 @@ struct r6_state { | |||
258 | #define R5_Wantfill 12 /* dev->toread contains a bio that needs | 260 | #define R5_Wantfill 12 /* dev->toread contains a bio that needs |
259 | * filling | 261 | * filling |
260 | */ | 262 | */ |
261 | #define R5_Wantprexor 13 /* distinguish blocks ready for rmw from | 263 | #define R5_Wantdrain 13 /* dev->towrite needs to be drained */ |
262 | * other "towrites" | ||
263 | */ | ||
264 | /* | 264 | /* |
265 | * Write method | 265 | * Write method |
266 | */ | 266 | */ |