diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 11:34:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 11:34:40 -0700 |
| commit | 25aa6a7ae46c6a041c46a2d314b9ab7c4f2baa41 (patch) | |
| tree | b99c627c269e38450d5d0f9713862d2ed06d6e5e /drivers/md/raid5.h | |
| parent | c8924234bd9c06fe86bae648c472d56cb10640a5 (diff) | |
| parent | d9f691c365a83ce2530f0e46b947365c2db44ea0 (diff) | |
| download | blackbird-op-linux-25aa6a7ae46c6a041c46a2d314b9ab7c4f2baa41.tar.gz blackbird-op-linux-25aa6a7ae46c6a041c46a2d314b9ab7c4f2baa41.zip | |
Merge tag 'md-3.6' of git://neil.brown.name/md
Pull additional md update from NeilBrown:
"This contains a few patches that depend on plugging changes in the
block layer so needed to wait for those.
It also contains a Kconfig fix for the new RAID10 support in dm-raid."
* tag 'md-3.6' of git://neil.brown.name/md:
md/dm-raid: DM_RAID should select MD_RAID10
md/raid1: submit IO from originating thread instead of md thread.
raid5: raid5d handle stripe in batch way
raid5: make_request use batch stripe release
Diffstat (limited to 'drivers/md/raid5.h')
| -rw-r--r-- | drivers/md/raid5.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h index 61dbb615c30b..a9fc24901eda 100644 --- a/drivers/md/raid5.h +++ b/drivers/md/raid5.h @@ -321,6 +321,7 @@ enum { STRIPE_BIOFILL_RUN, STRIPE_COMPUTE_RUN, STRIPE_OPS_REQ_PENDING, + STRIPE_ON_UNPLUG_LIST, }; /* |
