summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-13 19:59:29 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-13 19:59:29 +0200
commitd58d2d1adec90e7bc0c56e09b3ac0e9a5a471e68 (patch)
tree17044053cfbde45da9bf8654ab6272b92773181c /fs/ocfs2
parentMerge branch 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentmd: allow upper limit for resync/reshape to be set when array is read-only (diff)
downloadlinux-d58d2d1adec90e7bc0c56e09b3ac0e9a5a471e68.tar.xz
linux-d58d2d1adec90e7bc0c56e09b3ac0e9a5a471e68.zip
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')
0 files changed, 0 insertions, 0 deletions