| commit | 4d11eff66889e65e9351111b1cc39f066f9f9729 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 09 08:41:22 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 09 08:41:22 2009 -0700 |
| tree | e96ed48c0f9ad90e3d8dd319874dc6b577958374 | |
| parent | 3af968e066d593bc4dacc021715f3e95ddf0996f [diff] | |
| parent | 0e6e0271a210817e202c8a4bfffbde3e3c0616d1 [diff] |
Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md/raid5: fix bug in reshape code when chunk_size decreases. md/raid5 - avoid deadlocks in get_active_stripe during reshape md/raid5: use conf->raid_disks in preference to mddev->raid_disk