diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-13 10:59:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-13 10:59:29 -0700 |
| commit | d58d2d1adec90e7bc0c56e09b3ac0e9a5a471e68 (patch) | |
| tree | 17044053cfbde45da9bf8654ab6272b92773181c /fs/ocfs2/journal.h | |
| parent | 7334219c44826ae0ebe6f07555c6b97f978ce266 (diff) | |
| parent | 4d484a4a7a5126410eed5f8dd329a33f6eeed068 (diff) | |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md: allow upper limit for resync/reshape to be set when array is read-only
md/raid5: Properly remove excess drives after shrinking a raid5/6
md/raid5: make sure a reshape restarts at the correct address.
md/raid5: allow new reshape modes to be restarted in the middle.
md: never advance 'events' counter by more than 1.
Remove deadlock potential in md_open
Diffstat (limited to 'fs/ocfs2/journal.h')
0 files changed, 0 insertions, 0 deletions