]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
projects / thirdparty / kernel / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ddc9b34 b90f687)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Apr 2010 17:01:51 +0000 (10:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Apr 2010 17:01:51 +0000 (10:01 -0700)
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: Issue the discard operation *before* releasing the blocks to be reused
  ext4: Fix buffer head leaks after calls to ext4_get_inode_loc()
  ext4: Fix possible lost inode write in no journal mode

1  2 
fs/ext4/inode.c patch | diff1 | diff2 | blob | history
fs/ext4/mballoc.c patch | diff1 | diff2 | blob | history

diff --cc fs/ext4/inode.c
Simple merge
diff --cc fs/ext4/mballoc.c
Simple merge
A mirror of Linus' kernel repository