diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 09:53:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 09:53:20 -0700 |
| commit | 35806b4f7c5620b547f183e9d53f7cfaeabb582b (patch) | |
| tree | dc966f5edd9e482fdc85b8fb886ae39ce5c5ec80 /MAINTAINERS | |
| parent | 32e51f141fd8d880f57b6a2eb53ce72856254d4a (diff) | |
| parent | d183e11a4a66d80e10d60b0918a47cf073135379 (diff) | |
| download | lwn-35806b4f7c5620b547f183e9d53f7cfaeabb582b.tar.gz lwn-35806b4f7c5620b547f183e9d53f7cfaeabb582b.zip | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (61 commits)
jbd2: Add MAINTAINERS entry
jbd2: fix a potential leak of a journal_head on an error path
ext4: teach ext4_ext_split to calculate extents efficiently
ext4: Convert ext4 to new truncate calling convention
ext4: do not normalize block requests from fallocate()
ext4: enable "punch hole" functionality
ext4: add "punch hole" flag to ext4_map_blocks()
ext4: punch out extents
ext4: add new function ext4_block_zero_page_range()
ext4: add flag to ext4_has_free_blocks
ext4: reserve inodes and feature code for 'quota' feature
ext4: add support for multiple mount protection
ext4: ensure f_bfree returned by ext4_statfs() is non-negative
ext4: protect bb_first_free in ext4_trim_all_free() with group lock
ext4: only load buddy bitmap in ext4_trim_fs() when it is needed
jbd2: Fix comment to match the code in jbd2__journal_start()
ext4: fix waiting and sending of a barrier in ext4_sync_file()
jbd2: Add function jbd2_trans_will_send_data_barrier()
jbd2: fix sending of data flush on journal commit
ext4: fix ext4_ext_fiemap_cb() to handle blocks before request range correctly
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1ab17de642e5..d54d551004f7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3572,9 +3572,16 @@ M: Andrew Morton <akpm@linux-foundation.org> M: Jan Kara <jack@suse.cz> L: linux-ext4@vger.kernel.org S: Maintained -F: fs/jbd*/ -F: include/linux/ext*jbd*.h -F: include/linux/jbd*.h +F: fs/jbd/ +F: include/linux/ext3_jbd.h +F: include/linux/jbd.h + +JOURNALLING LAYER FOR BLOCK DEVICES (JBD2) +M: "Theodore Ts'o" <tytso@mit.edu> +L: linux-ext4@vger.kernel.org +S: Maintained +F: fs/jbd2/ +F: include/linux/jbd2.h JSM Neo PCI based serial card M: Breno Leitao <leitao@linux.vnet.ibm.com> |