diff options
| author | NeilBrown <neilb@suse.de> | 2011-07-26 03:19:49 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-07-26 03:19:49 +0200 |
| commit | 83206d66b65118d995c38746f21edc2bb8564b49 (patch) | |
| tree | 69e1c082cb33d19a508c764da613e0c6b5ced27b /drivers/md/raid5.h | |
| parent | md/raid5: get rid of duplicated call to bio_data_dir() (diff) | |
| download | linux-83206d66b65118d995c38746f21edc2bb8564b49.tar.xz linux-83206d66b65118d995c38746f21edc2bb8564b49.zip | |
md/raid5: Remove use of sh->lock in sync_request
This is the start of a series of patches to remove sh->lock.
sync_request takes sh->lock before setting STRIPE_SYNCING to ensure
there is no race with testing it in handle_stripe[56].
Instead, use a new flag STRIPE_SYNC_REQUESTED and test it early
in handle_stripe[56] (after getting the same lock) and perform the
same set/clear operations if it was set.
Signed-off-by: NeilBrown <neilb@suse.de>
Reviewed-by: Namhyung Kim <namhyung@gmail.com>
Diffstat (limited to 'drivers/md/raid5.h')
| -rw-r--r-- | drivers/md/raid5.h | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h index 3ca77a2613ba..a33001137bf8 100644 --- a/drivers/md/raid5.h +++ b/drivers/md/raid5.h @@ -289,21 +289,24 @@ struct r6_state { /* * Stripe state */ -#define STRIPE_HANDLE 2 -#define STRIPE_SYNCING 3 -#define STRIPE_INSYNC 4 -#define STRIPE_PREREAD_ACTIVE 5 -#define STRIPE_DELAYED 6 -#define STRIPE_DEGRADED 7 -#define STRIPE_BIT_DELAY 8 -#define STRIPE_EXPANDING 9 -#define STRIPE_EXPAND_SOURCE 10 -#define STRIPE_EXPAND_READY 11 -#define STRIPE_IO_STARTED 12 /* do not count towards 'bypass_count' */ -#define STRIPE_FULL_WRITE 13 /* all blocks are set to be overwritten */ -#define STRIPE_BIOFILL_RUN 14 -#define STRIPE_COMPUTE_RUN 15 -#define STRIPE_OPS_REQ_PENDING 16 +enum { + STRIPE_HANDLE, + STRIPE_SYNC_REQUESTED, + STRIPE_SYNCING, + STRIPE_INSYNC, + STRIPE_PREREAD_ACTIVE, + STRIPE_DELAYED, + STRIPE_DEGRADED, + STRIPE_BIT_DELAY, + STRIPE_EXPANDING, + STRIPE_EXPAND_SOURCE, + STRIPE_EXPAND_READY, + STRIPE_IO_STARTED, /* do not count towards 'bypass_count' */ + STRIPE_FULL_WRITE, /* all blocks are set to be overwritten */ + STRIPE_BIOFILL_RUN, + STRIPE_COMPUTE_RUN, + STRIPE_OPS_REQ_PENDING, +}; /* * Operation request flags |