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: (50 commits) jbd2: sparse pointer use of zero as null jbd2: Use round-jiffies() function for the "5 second" ext4/jbd2 wakeup jbd2: Mark jbd2 slabs as SLAB_TEMPORARY jbd2: add lockdep support ext4: Use the ext4_ext_actual_len() helper function ext4: fix uniniatilized extent splitting error ext4: Check for return value from sb_set_blocksize ext4: Add stripe= option to /proc/mounts ext4: Enable the multiblock allocator by default ext4: Add multi block allocator for ext4 ext4: Add new functions for searching extent tree ext4: Add ext4_find_next_bit() ext4: fix up EXT4FS_DEBUG builds ext4: Fix ext4_show_options to show the correct mount options. ext4: Add EXT4_IOC_MIGRATE ioctl ext4: Add inode version support in ext4 vfs: Add 64 bit i_version support ext4: Add the journal checksum feature jbd2: jbd2 stats through procfs ext4: Take read lock during overwrite case. ...
2026-09-20 18:15:29 +00:00 · 2008-01-29 22:43:38 +11:00 · 2008-01-29 22:43:38 +11:00 · 8cd226ca3f
commit 8cd226ca3f
parent 6b11d8179d 4019191be7
46 changed files with 7679 additions and 804 deletions
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/fs/Kconfig
+++ b/fs/Kconfig
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
--- a/fs/afs/inode.c
+++ b/fs/afs/inode.c
--- a/fs/buffer.c
+++ b/fs/buffer.c
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
--- a/fs/ext4/Makefile
+++ b/fs/ext4/Makefile
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
--- a/fs/ext4/group.h
+++ b/fs/ext4/group.h
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
--- a/fs/ext4/migrate.c
+++ b/fs/ext4/migrate.c
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
--- a/fs/inode.c
+++ b/fs/inode.c
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
--- a/fs/jbd2/recovery.c
+++ b/fs/jbd2/recovery.c
--- a/fs/jbd2/revoke.c
+++ b/fs/jbd2/revoke.c
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
--- a/fs/read_write.c
+++ b/fs/read_write.c
--- a/include/asm-arm/bitops.h
+++ b/include/asm-arm/bitops.h
--- a/include/asm-generic/bitops/ext2-non-atomic.h
+++ b/include/asm-generic/bitops/ext2-non-atomic.h
--- a/include/asm-generic/bitops/le.h
+++ b/include/asm-generic/bitops/le.h
--- a/include/asm-m68k/bitops.h
+++ b/include/asm-m68k/bitops.h
--- a/include/asm-m68knommu/bitops.h
+++ b/include/asm-m68knommu/bitops.h
--- a/include/asm-powerpc/bitops.h
+++ b/include/asm-powerpc/bitops.h
--- a/include/asm-s390/bitops.h
+++ b/include/asm-s390/bitops.h
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
--- a/include/linux/ext4_fs.h
+++ b/include/linux/ext4_fs.h
--- a/include/linux/ext4_fs_extents.h
+++ b/include/linux/ext4_fs_extents.h
--- a/include/linux/ext4_fs_i.h
+++ b/include/linux/ext4_fs_i.h
--- a/include/linux/ext4_fs_sb.h
+++ b/include/linux/ext4_fs_sb.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
--- a/lib/find_next_bit.c
+++ b/lib/find_next_bit.c