Skip to content

Commit 5993692

Browse files
committed
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 updates from Ted Ts'o: - further restructure ext4 documentation - fix up ext4's delayed allocation for bigalloc file systems - fix up some syzbot-detected races in EXT4_IOC_MOVE_EXT, EXT4_IOC_SWAP_BOOT, and ext4_remount - ... and a few other miscellaneous bugs and optimizations. * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (21 commits) ext4: fix use-after-free race in ext4_remount()'s error path ext4: cache NULL when both default_acl and acl are NULL docs: promote the ext4 data structures book to top level docs: move ext4 administrative docs to admin-guide/ jbd2: fix use after free in jbd2_log_do_checkpoint() ext4: propagate error from dquot_initialize() in EXT4_IOC_FSSETXATTR ext4: fix setattr project check in fssetxattr ioctl docs: make ext4 readme tables readable docs: fix ext4 documentation table formatting problems docs: generate a separate ext4 pdf file from the documentation ext4: convert fault handler to use vm_fault_t type ext4: initialize retries variable in ext4_da_write_inline_data_begin() ext4: fix EXT4_IOC_SWAP_BOOT ext4: fix build error when DX_DEBUG is defined ext4: fix argument checking in EXT4_IOC_MOVE_EXT ext4: fix reserved cluster accounting at page invalidation time ext4: adjust reserved cluster count when removing extents ext4: reduce reserved cluster count by number of allocated clusters ext4: fix reserved cluster accounting at delayed write time ext4: add new pending reservation mechanism ...
2 parents d6edff7 + 33458ea commit 5993692

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1984
-1169
lines changed

Documentation/admin-guide/ext4.rst

Lines changed: 574 additions & 0 deletions
Large diffs are not rendered by default.

Documentation/admin-guide/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ configure specific aspects of kernel behavior to your liking.
7171
java
7272
ras
7373
bcache
74+
ext4
7475
pm/index
7576
thunderbolt
7677
LSM/index

Documentation/conf.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,10 @@
383383
'The kernel development community', 'manual'),
384384
('filesystems/index', 'filesystems.tex', 'Linux Filesystems API',
385385
'The kernel development community', 'manual'),
386+
('admin-guide/ext4', 'ext4-admin-guide.tex', 'ext4 Administration Guide',
387+
'ext4 Community', 'manual'),
388+
('filesystems/ext4/index', 'ext4-data-structures.tex',
389+
'ext4 Data Structures and Algorithms', 'ext4 Community', 'manual'),
386390
('gpu/index', 'gpu.tex', 'Linux GPU Driver Developer\'s Guide',
387391
'The kernel development community', 'manual'),
388392
('input/index', 'linux-input.tex', 'The Linux input driver subsystem',

Documentation/filesystems/ext4/ondisk/attributes.rst renamed to Documentation/filesystems/ext4/attributes.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Extended attributes, when stored after the inode, have a header
3030
``ext4_xattr_ibody_header`` that is 4 bytes long:
3131

3232
.. list-table::
33-
:widths: 1 1 1 77
33+
:widths: 8 8 24 40
3434
:header-rows: 1
3535

3636
* - Offset
@@ -47,7 +47,7 @@ The beginning of an extended attribute block is in
4747
``struct ext4_xattr_header``, which is 32 bytes long:
4848

4949
.. list-table::
50-
:widths: 1 1 1 77
50+
:widths: 8 8 24 40
5151
:header-rows: 1
5252

5353
* - Offset
@@ -92,7 +92,7 @@ entries must be stored in sorted order. The sort order is
9292
Attributes stored inside an inode do not need be stored in sorted order.
9393

9494
.. list-table::
95-
:widths: 1 1 1 77
95+
:widths: 8 8 24 40
9696
:header-rows: 1
9797

9898
* - Offset
@@ -157,7 +157,7 @@ attribute name index field is set, and matching string is removed from
157157
the key name. Here is a map of name index values to key prefixes:
158158

159159
.. list-table::
160-
:widths: 1 79
160+
:widths: 16 64
161161
:header-rows: 1
162162

163163
* - Name Index

0 commit comments

Comments
 (0)