History

Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Pull ext4 fixes from Ted Ts'o: "Bug fixes and regressions for ext4, the most serious of which is a potential deadlock during directory renames that was introduced during the merge window discovered by a combination of syzbot and lockdep" * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: zero i_disksize when initializing the bootloader inode ext4: make sure fs error flag setted before clear journal error ext4: commit super block if fs record error when journal record without error ext4, jbd2: add an optimized bmap for the journal inode ext4: fix WARNING in ext4_update_inline_data ext4: move where set the MAY_INLINE_DATA flag is set ext4: Fix deadlock during directory rename ext4: Fix comment about the 64BIT feature docs: ext4: modify the group desc size to 64 ext4: fix another off-by-one fsmap error on 1k block filesystems ext4: fix RENAME_WHITEOUT handling for inline directories ext4: make kobj_type structures constant ext4: fix cgroup writeback accounting with fs-layer encryption

Linus Torvalds committed 3 years ago

Commit 40d0c092 parents e730408 f5361da13 files · +98 −33Browse files

Showing the changes to Documentation (1 of 13 files). Show all

Unified · Split

Documentation/filesystems/ext4/blockgroup.rst+3−3
@@ -105,9 +105,9 @@ descriptors. Instead, the superblock and a single block group descriptor · 104 unmodified lines
105block is placed at the beginning of the first, second, and last block105block is placed at the beginning of the first, second, and last block
106groups in a meta-block group. A meta-block group is a collection of106groups in a meta-block group. A meta-block group is a collection of
107block groups which can be described by a single block group descriptor107block groups which can be described by a single block group descriptor
108block. Since the size of the block group descriptor structure is 32108block. Since the size of the block group descriptor structure is 64
109bytes, a meta-block group contains 32 block groups for filesystems with109bytes, a meta-block group contains 16 block groups for filesystems with
110a 1KB block size, and 128 block groups for filesystems with a 4KB110a 1KB block size, and 64 block groups for filesystems with a 4KB
111blocksize. Filesystems can either be created using this new block group111blocksize. Filesystems can either be created using this new block group
112descriptor layout, or existing filesystems can be resized on-line, and112descriptor layout, or existing filesystems can be resized on-line, and
113the field s_first_meta_bg in the superblock will indicate the first113the field s_first_meta_bg in the superblock will indicate the first