author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 21 Nov 2011 20:11:37 +0000 (12:11 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 21 Nov 2011 20:11:37 +0000 (12:11 -0800) |
* 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix up a undefined error in ext4_free_blocks in debugging code
ext4: add blk_finish_plug in error case of writepages.
ext4: Remove kernel_lock annotations
ext4: ignore journalled data options on remount if fs has no journal
ext4: fix up a undefined error in ext4_free_blocks in debugging code
ext4: add blk_finish_plug in error case of writepages.
ext4: Remove kernel_lock annotations
ext4: ignore journalled data options on remount if fs has no journal
1 | 2 | |||
---|---|---|---|---|
fs/ext4/inode.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc fs/ext4/inode.c
Simple merge