diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 22:56:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 22:56:32 -0700 |
commit | 93416253073511716f7e70c06e32c3810c3deac4 (patch) | |
tree | 7e6a4c7dab40596f6b622f0eaa4b3366ed671b79 /drivers/md/raid10.h | |
parent | b4322e7057ca851b0a3e15f29e26806efeada100 (diff) | |
parent | 3424bf6a772cff606fc4bc24a3639c937afb547f (diff) | |
download | kernel_samsung_tuna-93416253073511716f7e70c06e32c3810c3deac4.zip kernel_samsung_tuna-93416253073511716f7e70c06e32c3810c3deac4.tar.gz kernel_samsung_tuna-93416253073511716f7e70c06e32c3810c3deac4.tar.bz2 |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md/raid5: don't include 'spare' drives when reshaping to fewer devices.
md/raid5: add a missing 'continue' in a loop.
md/raid5: Allow recovered part of partially recovered devices to be in-sync
md/raid5: More careful check for "has array failed".
md: Don't update ->recovery_offset when reshaping an array to fewer devices.
md/raid5: avoid oops when number of devices is reduced then increased.
md: enable raid4->raid0 takeover
md: clear layout after ->raid0 takeover
md: fix raid10 takeover: use new_layout for setup_conf
md: fix handling of array level takeover that re-arranges devices.
md: raid10: Fix null pointer dereference in fix_read_error()
Restore partition detection of newly created md arrays.
Diffstat (limited to 'drivers/md/raid10.h')
-rw-r--r-- | drivers/md/raid10.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/md/raid10.h b/drivers/md/raid10.h index 3824a08..2316ac2 100644 --- a/drivers/md/raid10.h +++ b/drivers/md/raid10.h @@ -38,11 +38,6 @@ struct r10_private_data_s { int chunk_shift; /* shift from chunks to sectors */ sector_t chunk_mask; - int scale_disks; /* When starting array, multiply - * each ->raid_disk by this. - * Need for raid0->raid10 migration - */ - struct list_head retry_list; /* queue pending writes and submit them on unplug */ struct bio_list pending_bio_list; |