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: ext4: Remove bogus BUG() check in ext4_bmap() ext4: Fix building with EXT4FS_DEBUG ext4: Initialize the new group descriptor when resizing the filesystem ext4: Fix ext4_free_blocks() w/o a journal when files have indirect blocks jbd2: On a __journal_expect() assertion failure printk "JBD2", not "EXT3-fs" ext3: Add sanity check to make_indexed_dir ext4: Add sanity check to make_indexed_dir ext4: only use i_size_high for regular files ext4: fix wrong use of do_div
No related branches found
No related tags found
Showing
- fs/ext3/namei.c 14 additions, 6 deletionsfs/ext3/namei.c
- fs/ext4/balloc.c 3 additions, 3 deletionsfs/ext4/balloc.c
- fs/ext4/ext4.h 5 additions, 2 deletionsfs/ext4/ext4.h
- fs/ext4/extents.c 1 addition, 1 deletionfs/ext4/extents.c
- fs/ext4/inode.c 3 additions, 6 deletionsfs/ext4/inode.c
- fs/ext4/mballoc.c 1 addition, 1 deletionfs/ext4/mballoc.c
- fs/ext4/namei.c 15 additions, 6 deletionsfs/ext4/namei.c
- fs/ext4/resize.c 2 additions, 1 deletionfs/ext4/resize.c
- fs/jbd2/journal.c 3 additions, 3 deletionsfs/jbd2/journal.c
- include/linux/jbd2.h 2 additions, 1 deletioninclude/linux/jbd2.h
Loading
Please register or sign in to comment