diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 09:18:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 09:18:52 -0700 |
commit | 2511817cf9b1cf2506f47e20bb128e2da231c150 (patch) | |
tree | 26b0cd6b9491bcb1284e6c60f64ea1dbd25f2aa7 /fs/dlm | |
parent | 714af0693863dfb6f075f4465053976d2d076a21 (diff) | |
parent | 56fcad29d4b3cbcbb2ed47a9d3ceca3f57175417 (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
ext3: Flush disk caches on fsync when needed
ext3: Add locking to ext3_do_update_inode
ext3: Fix possible deadlock between ext3_truncate() and ext3_get_blocks()
jbd: Annotate transaction start also for journal_restart()
jbd: Journal block numbers can ever be only 32-bit use unsigned int for them
ext3: Update MAINTAINERS for ext3 and JBD
JBD: round commit timer up to avoid uncommitted transaction
Diffstat (limited to 'fs/dlm')
0 files changed, 0 insertions, 0 deletions