tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'ext4_for_linus-6.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 bug fixes from Ted Ts'o:
- Fix regression caused by removing CONFIG_EXT3_FS when testing some
very old defconfigs
- Avoid a BUG_ON when opening a file on a maliciously corrupted file
system
- Avoid mm warnings when freeing a very large orphan file metadata
- Avoid a theoretical races between metadata writeback and checkpoints
(it's very hard to hit in practice, since the race requires that the
writeback take a very long time)
* tag 'ext4_for_linus-6.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
Use CONFIG_EXT4_FS instead of CONFIG_EXT3_FS in all of the defconfigs
ext4: free orphan info with kvfree
ext4: detect invalid INLINE_DATA + EXTENTS flag combination
ext4, doc: fix and improve directory hash tree description
ext4: wait for ongoing I/O to complete before freeing blocks
jbd2: ensure that all ongoing I/O complete before freeing blocks
+232
-211
+31
-30
Documentation/filesystems/ext4/directory.rst
+31
-30
Documentation/filesystems/ext4/directory.rst
···
183
183
- det_checksum
184
184
- Directory leaf block checksum.
185
185
186
-
The leaf directory block checksum is calculated against the FS UUID, the
187
-
directory's inode number, the directory's inode generation number, and
188
-
the entire directory entry block up to (but not including) the fake
189
-
directory entry.
186
+
The leaf directory block checksum is calculated against the FS UUID (or
187
+
the checksum seed, if that feature is enabled for the fs), the directory's
188
+
inode number, the directory's inode generation number, and the entire
189
+
directory entry block up to (but not including) the fake directory entry.
190
190
191
191
Hash Tree Directories
192
192
~~~~~~~~~~~~~~~~~~~~~
···
196
196
balanced tree keyed off a hash of the directory entry name. If the
197
197
EXT4_INDEX_FL (0x1000) flag is set in the inode, this directory uses a
198
198
hashed btree (htree) to organize and find directory entries. For
199
-
backwards read-only compatibility with ext2, this tree is actually
200
-
hidden inside the directory file, masquerading as “empty” directory data
201
-
blocks! It was stated previously that the end of the linear directory
202
-
entry table was signified with an entry pointing to inode 0; this is
203
-
(ab)used to fool the old linear-scan algorithm into thinking that the
204
-
rest of the directory block is empty so that it moves on.
199
+
backwards read-only compatibility with ext2, interior tree nodes are actually
200
+
hidden inside the directory file, masquerading as “empty” directory entries
201
+
spanning the whole block. It was stated previously that directory entries
202
+
with the inode set to 0 are treated as unused entries; this is (ab)used to
203
+
fool the old linear-scan algorithm into skipping over those blocks containing
204
+
the interior tree node data.
205
205
206
206
The root of the tree always lives in the first data block of the
207
207
directory. By ext2 custom, the '.' and '..' entries must appear at the
···
209
209
``struct ext4_dir_entry_2`` s and not stored in the tree. The rest of
210
210
the root node contains metadata about the tree and finally a hash->block
211
211
map to find nodes that are lower in the htree. If
212
-
``dx_root.info.indirect_levels`` is non-zero then the htree has two
213
-
levels; the data block pointed to by the root node's map is an interior
214
-
node, which is indexed by a minor hash. Interior nodes in this tree
215
-
contains a zeroed out ``struct ext4_dir_entry_2`` followed by a
216
-
minor_hash->block map to find leafe nodes. Leaf nodes contain a linear
217
-
array of all ``struct ext4_dir_entry_2``; all of these entries
218
-
(presumably) hash to the same value. If there is an overflow, the
219
-
entries simply overflow into the next leaf node, and the
220
-
least-significant bit of the hash (in the interior node map) that gets
221
-
us to this next leaf node is set.
212
+
``dx_root.info.indirect_levels`` is non-zero then the htree has that many
213
+
levels and the blocks pointed to by the root node's map are interior nodes.
214
+
These interior nodes have a zeroed out ``struct ext4_dir_entry_2`` followed by
215
+
a hash->block map to find nodes of the next level. Leaf nodes look like
216
+
classic linear directory blocks, but all of its entries have a hash value
217
+
equal or greater than the indicated hash of the parent node.
222
218
223
-
To traverse the directory as a htree, the code calculates the hash of
224
-
the desired file name and uses it to find the corresponding block
225
-
number. If the tree is flat, the block is a linear array of directory
226
-
entries that can be searched; otherwise, the minor hash of the file name
227
-
is computed and used against this second block to find the corresponding
228
-
third block number. That third block number will be a linear array of
229
-
directory entries.
219
+
The actual hash value for an entry name is only 31 bits, the least-significant
220
+
bit is set to 0. However, if there is a hash collision between directory
221
+
entries, the least-significant bit may get set to 1 on interior nodes in the
222
+
case where these two (or more) hash-colliding entries do not fit into one leaf
223
+
node and must be split across multiple nodes.
224
+
225
+
To look up a name in such a htree, the code calculates the hash of the desired
226
+
file name and uses it to find the leaf node with the range of hash values the
227
+
calculated hash falls into (in other words, a lookup works basically the same
228
+
as it would in a B-Tree keyed by the hash value), and possibly also scanning
229
+
the leaf nodes that follow (in tree order) in case of hash collisions.
230
230
231
231
To traverse the directory as a linear array (such as the old code does),
232
232
the code simply reads every data block in the directory. The blocks used
···
319
319
* - 0x24
320
320
- __le32
321
321
- block
322
-
- The block number (within the directory file) that goes with hash=0.
322
+
- The block number (within the directory file) that lead to the left-most
323
+
leaf node, i.e. the leaf containing entries with the lowest hash values.
323
324
* - 0x28
324
325
- struct dx_entry
325
326
- entries[0]
···
443
442
* - 0x0
444
443
- u32
445
444
- dt_reserved
446
-
- Zero.
445
+
- Unused (but still part of the checksum curiously).
447
446
* - 0x4
448
447
- __le32
449
448
- dt_checksum
···
451
450
452
451
The checksum is calculated against the FS UUID, the htree index header
453
452
(dx_root or dx_node), all of the htree indices (dx_entry) that are in
454
-
use, and the tail block (dx_tail).
453
+
use, and the tail block (dx_tail) with the dt_checksum initially set to 0.
+1
-1
arch/arc/configs/axs101_defconfig
+1
-1
arch/arc/configs/axs101_defconfig
+1
-1
arch/arc/configs/axs103_defconfig
+1
-1
arch/arc/configs/axs103_defconfig
+1
-1
arch/arc/configs/axs103_smp_defconfig
+1
-1
arch/arc/configs/axs103_smp_defconfig
+1
-1
arch/arc/configs/hsdk_defconfig
+1
-1
arch/arc/configs/hsdk_defconfig
+1
-1
arch/arc/configs/vdk_hs38_defconfig
+1
-1
arch/arc/configs/vdk_hs38_defconfig
+1
-1
arch/arc/configs/vdk_hs38_smp_defconfig
+1
-1
arch/arc/configs/vdk_hs38_smp_defconfig
+1
-1
arch/arm/configs/axm55xx_defconfig
+1
-1
arch/arm/configs/axm55xx_defconfig
+2
-2
arch/arm/configs/bcm2835_defconfig
+2
-2
arch/arm/configs/bcm2835_defconfig
+1
-1
arch/arm/configs/davinci_all_defconfig
+1
-1
arch/arm/configs/davinci_all_defconfig
+2
-2
arch/arm/configs/dove_defconfig
+2
-2
arch/arm/configs/dove_defconfig
+2
-2
arch/arm/configs/ep93xx_defconfig
+2
-2
arch/arm/configs/ep93xx_defconfig
+3
-3
arch/arm/configs/imx_v6_v7_defconfig
+3
-3
arch/arm/configs/imx_v6_v7_defconfig
···
436
436
CONFIG_EXT2_FS_XATTR=y
437
437
CONFIG_EXT2_FS_POSIX_ACL=y
438
438
CONFIG_EXT2_FS_SECURITY=y
439
-
CONFIG_EXT3_FS=y
440
-
CONFIG_EXT3_FS_POSIX_ACL=y
441
-
CONFIG_EXT3_FS_SECURITY=y
439
+
CONFIG_EXT4_FS=y
440
+
CONFIG_EXT4_FS_POSIX_ACL=y
441
+
CONFIG_EXT4_FS_SECURITY=y
442
442
CONFIG_QUOTA=y
443
443
CONFIG_QUOTA_NETLINK_INTERFACE=y
444
444
CONFIG_AUTOFS_FS=y
+2
-2
arch/arm/configs/ixp4xx_defconfig
+2
-2
arch/arm/configs/ixp4xx_defconfig
+1
-1
arch/arm/configs/mmp2_defconfig
+1
-1
arch/arm/configs/mmp2_defconfig
+1
-1
arch/arm/configs/moxart_defconfig
+1
-1
arch/arm/configs/moxart_defconfig
+1
-1
arch/arm/configs/multi_v5_defconfig
+1
-1
arch/arm/configs/multi_v5_defconfig
+2
-2
arch/arm/configs/mv78xx0_defconfig
+2
-2
arch/arm/configs/mv78xx0_defconfig
+1
-1
arch/arm/configs/mvebu_v5_defconfig
+1
-1
arch/arm/configs/mvebu_v5_defconfig
+1
-1
arch/arm/configs/nhk8815_defconfig
+1
-1
arch/arm/configs/nhk8815_defconfig
+1
-1
arch/arm/configs/omap1_defconfig
+1
-1
arch/arm/configs/omap1_defconfig
+1
-1
arch/arm/configs/omap2plus_defconfig
+1
-1
arch/arm/configs/omap2plus_defconfig
+2
-2
arch/arm/configs/orion5x_defconfig
+2
-2
arch/arm/configs/orion5x_defconfig
+3
-3
arch/arm/configs/pxa_defconfig
+3
-3
arch/arm/configs/pxa_defconfig
···
579
579
CONFIG_EXT2_FS_XATTR=y
580
580
CONFIG_EXT2_FS_POSIX_ACL=y
581
581
CONFIG_EXT2_FS_SECURITY=y
582
-
CONFIG_EXT3_FS=y
583
-
CONFIG_EXT3_FS_POSIX_ACL=y
584
-
CONFIG_EXT3_FS_SECURITY=y
582
+
CONFIG_EXT4_FS=y
583
+
CONFIG_EXT4_FS_POSIX_ACL=y
584
+
CONFIG_EXT4_FS_SECURITY=y
585
585
CONFIG_XFS_FS=m
586
586
CONFIG_AUTOFS_FS=m
587
587
CONFIG_FUSE_FS=m
+1
-1
arch/arm/configs/qcom_defconfig
+1
-1
arch/arm/configs/qcom_defconfig
+1
-1
arch/arm/configs/rpc_defconfig
+1
-1
arch/arm/configs/rpc_defconfig
+3
-3
arch/arm/configs/s3c6400_defconfig
+3
-3
arch/arm/configs/s3c6400_defconfig
···
52
52
CONFIG_RTC_DRV_S3C=y
53
53
CONFIG_PWM=y
54
54
CONFIG_EXT2_FS=y
55
-
CONFIG_EXT3_FS=y
56
-
CONFIG_EXT3_FS_POSIX_ACL=y
57
-
CONFIG_EXT3_FS_SECURITY=y
55
+
CONFIG_EXT4_FS=y
56
+
CONFIG_EXT4_FS_POSIX_ACL=y
57
+
CONFIG_EXT4_FS_SECURITY=y
58
58
CONFIG_TMPFS=y
59
59
CONFIG_TMPFS_POSIX_ACL=y
60
60
CONFIG_CRAMFS=y
+1
-1
arch/arm/configs/sama7_defconfig
+1
-1
arch/arm/configs/sama7_defconfig
+1
-1
arch/arm/configs/socfpga_defconfig
+1
-1
arch/arm/configs/socfpga_defconfig
+2
-2
arch/arm/configs/spear13xx_defconfig
+2
-2
arch/arm/configs/spear13xx_defconfig
+2
-2
arch/arm/configs/spear3xx_defconfig
+2
-2
arch/arm/configs/spear3xx_defconfig
+2
-2
arch/arm/configs/spear6xx_defconfig
+2
-2
arch/arm/configs/spear6xx_defconfig
+2
-2
arch/arm/configs/spitz_defconfig
+2
-2
arch/arm/configs/spitz_defconfig
···
193
193
CONFIG_EXT2_FS_XATTR=y
194
194
CONFIG_EXT2_FS_POSIX_ACL=y
195
195
CONFIG_EXT2_FS_SECURITY=y
196
-
CONFIG_EXT3_FS=y
197
-
# CONFIG_EXT3_FS_XATTR is not set
196
+
CONFIG_EXT4_FS=y
197
+
# CONFIG_EXT4_FS_XATTR is not set
198
198
CONFIG_MSDOS_FS=y
199
199
CONFIG_VFAT_FS=y
200
200
CONFIG_TMPFS=y
+1
-1
arch/arm/configs/stm32_defconfig
+1
-1
arch/arm/configs/stm32_defconfig
+3
-3
arch/arm/configs/tegra_defconfig
+3
-3
arch/arm/configs/tegra_defconfig
···
319
319
CONFIG_EXT2_FS_XATTR=y
320
320
CONFIG_EXT2_FS_POSIX_ACL=y
321
321
CONFIG_EXT2_FS_SECURITY=y
322
-
CONFIG_EXT3_FS=y
323
-
CONFIG_EXT3_FS_POSIX_ACL=y
324
-
CONFIG_EXT3_FS_SECURITY=y
322
+
CONFIG_EXT4_FS=y
323
+
CONFIG_EXT4_FS_POSIX_ACL=y
324
+
CONFIG_EXT4_FS_SECURITY=y
325
325
# CONFIG_DNOTIFY is not set
326
326
CONFIG_VFAT_FS=y
327
327
CONFIG_TMPFS=y
+1
-1
arch/arm/configs/u8500_defconfig
+1
-1
arch/arm/configs/u8500_defconfig
+1
-1
arch/arm/configs/vexpress_defconfig
+1
-1
arch/arm/configs/vexpress_defconfig
+3
-3
arch/hexagon/configs/comet_defconfig
+3
-3
arch/hexagon/configs/comet_defconfig
···
46
46
CONFIG_EXT2_FS_XATTR=y
47
47
CONFIG_EXT2_FS_POSIX_ACL=y
48
48
CONFIG_EXT2_FS_SECURITY=y
49
-
CONFIG_EXT3_FS=y
49
+
CONFIG_EXT4_FS=y
50
50
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
51
-
CONFIG_EXT3_FS_POSIX_ACL=y
52
-
CONFIG_EXT3_FS_SECURITY=y
51
+
CONFIG_EXT4_FS_POSIX_ACL=y
52
+
CONFIG_EXT4_FS_SECURITY=y
53
53
CONFIG_QUOTA=y
54
54
CONFIG_PROC_KCORE=y
55
55
CONFIG_TMPFS=y
+3
-3
arch/m68k/configs/stmark2_defconfig
+3
-3
arch/m68k/configs/stmark2_defconfig
···
72
72
CONFIG_EXT2_FS_XATTR=y
73
73
CONFIG_EXT2_FS_POSIX_ACL=y
74
74
CONFIG_EXT2_FS_SECURITY=y
75
-
CONFIG_EXT3_FS=y
76
-
CONFIG_EXT3_FS_POSIX_ACL=y
77
-
CONFIG_EXT3_FS_SECURITY=y
75
+
CONFIG_EXT4_FS=y
76
+
CONFIG_EXT4_FS_POSIX_ACL=y
77
+
CONFIG_EXT4_FS_SECURITY=y
78
78
# CONFIG_FILE_LOCKING is not set
79
79
# CONFIG_DNOTIFY is not set
80
80
# CONFIG_INOTIFY_USER is not set
+1
-1
arch/microblaze/configs/mmu_defconfig
+1
-1
arch/microblaze/configs/mmu_defconfig
+3
-3
arch/mips/configs/bigsur_defconfig
+3
-3
arch/mips/configs/bigsur_defconfig
···
144
144
CONFIG_EXT2_FS_XATTR=y
145
145
CONFIG_EXT2_FS_POSIX_ACL=y
146
146
CONFIG_EXT2_FS_SECURITY=y
147
-
CONFIG_EXT3_FS=m
148
-
CONFIG_EXT3_FS_POSIX_ACL=y
149
-
CONFIG_EXT3_FS_SECURITY=y
147
+
CONFIG_EXT4_FS=m
148
+
CONFIG_EXT4_FS_POSIX_ACL=y
149
+
CONFIG_EXT4_FS_SECURITY=y
150
150
CONFIG_EXT4_FS=y
151
151
CONFIG_QUOTA=y
152
152
CONFIG_QUOTA_NETLINK_INTERFACE=y
+3
-3
arch/mips/configs/cobalt_defconfig
+3
-3
arch/mips/configs/cobalt_defconfig
···
59
59
CONFIG_EXT2_FS_XATTR=y
60
60
CONFIG_EXT2_FS_POSIX_ACL=y
61
61
CONFIG_EXT2_FS_SECURITY=y
62
-
CONFIG_EXT3_FS=y
63
-
CONFIG_EXT3_FS_POSIX_ACL=y
64
-
CONFIG_EXT3_FS_SECURITY=y
62
+
CONFIG_EXT4_FS=y
63
+
CONFIG_EXT4_FS_POSIX_ACL=y
64
+
CONFIG_EXT4_FS_SECURITY=y
65
65
CONFIG_PROC_KCORE=y
66
66
CONFIG_TMPFS=y
67
67
CONFIG_TMPFS_POSIX_ACL=y
+3
-3
arch/mips/configs/decstation_64_defconfig
+3
-3
arch/mips/configs/decstation_64_defconfig
···
133
133
CONFIG_EXT2_FS_XATTR=y
134
134
CONFIG_EXT2_FS_POSIX_ACL=y
135
135
CONFIG_EXT2_FS_SECURITY=y
136
-
CONFIG_EXT3_FS=y
137
-
CONFIG_EXT3_FS_POSIX_ACL=y
138
-
CONFIG_EXT3_FS_SECURITY=y
136
+
CONFIG_EXT4_FS=y
137
+
CONFIG_EXT4_FS_POSIX_ACL=y
138
+
CONFIG_EXT4_FS_SECURITY=y
139
139
CONFIG_ISO9660_FS=y
140
140
CONFIG_JOLIET=y
141
141
CONFIG_PROC_KCORE=y
+3
-3
arch/mips/configs/decstation_defconfig
+3
-3
arch/mips/configs/decstation_defconfig
···
129
129
CONFIG_EXT2_FS_XATTR=y
130
130
CONFIG_EXT2_FS_POSIX_ACL=y
131
131
CONFIG_EXT2_FS_SECURITY=y
132
-
CONFIG_EXT3_FS=y
133
-
CONFIG_EXT3_FS_POSIX_ACL=y
134
-
CONFIG_EXT3_FS_SECURITY=y
132
+
CONFIG_EXT4_FS=y
133
+
CONFIG_EXT4_FS_POSIX_ACL=y
134
+
CONFIG_EXT4_FS_SECURITY=y
135
135
CONFIG_ISO9660_FS=y
136
136
CONFIG_JOLIET=y
137
137
CONFIG_PROC_KCORE=y
+3
-3
arch/mips/configs/decstation_r4k_defconfig
+3
-3
arch/mips/configs/decstation_r4k_defconfig
···
129
129
CONFIG_EXT2_FS_XATTR=y
130
130
CONFIG_EXT2_FS_POSIX_ACL=y
131
131
CONFIG_EXT2_FS_SECURITY=y
132
-
CONFIG_EXT3_FS=y
133
-
CONFIG_EXT3_FS_POSIX_ACL=y
134
-
CONFIG_EXT3_FS_SECURITY=y
132
+
CONFIG_EXT4_FS=y
133
+
CONFIG_EXT4_FS_POSIX_ACL=y
134
+
CONFIG_EXT4_FS_SECURITY=y
135
135
CONFIG_ISO9660_FS=y
136
136
CONFIG_JOLIET=y
137
137
CONFIG_PROC_KCORE=y
+1
-1
arch/mips/configs/fuloong2e_defconfig
+1
-1
arch/mips/configs/fuloong2e_defconfig
+3
-3
arch/mips/configs/ip22_defconfig
+3
-3
arch/mips/configs/ip22_defconfig
···
232
232
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
233
233
CONFIG_RTC_DRV_DS1286=y
234
234
CONFIG_EXT2_FS=m
235
-
CONFIG_EXT3_FS=y
236
-
CONFIG_EXT3_FS_POSIX_ACL=y
237
-
CONFIG_EXT3_FS_SECURITY=y
235
+
CONFIG_EXT4_FS=y
236
+
CONFIG_EXT4_FS_POSIX_ACL=y
237
+
CONFIG_EXT4_FS_SECURITY=y
238
238
CONFIG_XFS_FS=m
239
239
CONFIG_XFS_QUOTA=y
240
240
CONFIG_QUOTA=y
+3
-3
arch/mips/configs/ip27_defconfig
+3
-3
arch/mips/configs/ip27_defconfig
···
272
272
CONFIG_EXT2_FS_XATTR=y
273
273
CONFIG_EXT2_FS_POSIX_ACL=y
274
274
CONFIG_EXT2_FS_SECURITY=y
275
-
CONFIG_EXT3_FS=y
276
-
CONFIG_EXT3_FS_POSIX_ACL=y
277
-
CONFIG_EXT3_FS_SECURITY=y
275
+
CONFIG_EXT4_FS=y
276
+
CONFIG_EXT4_FS_POSIX_ACL=y
277
+
CONFIG_EXT4_FS_SECURITY=y
278
278
CONFIG_XFS_FS=m
279
279
CONFIG_XFS_QUOTA=y
280
280
CONFIG_XFS_POSIX_ACL=y
+3
-3
arch/mips/configs/ip28_defconfig
+3
-3
arch/mips/configs/ip28_defconfig
···
49
49
CONFIG_INDYDOG=y
50
50
# CONFIG_VGA_CONSOLE is not set
51
51
CONFIG_EXT2_FS=y
52
-
CONFIG_EXT3_FS=y
53
-
CONFIG_EXT3_FS_POSIX_ACL=y
54
-
CONFIG_EXT3_FS_SECURITY=y
52
+
CONFIG_EXT4_FS=y
53
+
CONFIG_EXT4_FS_POSIX_ACL=y
54
+
CONFIG_EXT4_FS_SECURITY=y
55
55
CONFIG_QUOTA=y
56
56
CONFIG_PROC_KCORE=y
57
57
# CONFIG_PROC_PAGE_MONITOR is not set
+3
-3
arch/mips/configs/ip30_defconfig
+3
-3
arch/mips/configs/ip30_defconfig
···
143
143
CONFIG_EXT2_FS_XATTR=y
144
144
CONFIG_EXT2_FS_POSIX_ACL=y
145
145
CONFIG_EXT2_FS_SECURITY=y
146
-
CONFIG_EXT3_FS=y
147
-
CONFIG_EXT3_FS_POSIX_ACL=y
148
-
CONFIG_EXT3_FS_SECURITY=y
146
+
CONFIG_EXT4_FS=y
147
+
CONFIG_EXT4_FS_POSIX_ACL=y
148
+
CONFIG_EXT4_FS_SECURITY=y
149
149
CONFIG_XFS_FS=m
150
150
CONFIG_XFS_QUOTA=y
151
151
CONFIG_XFS_POSIX_ACL=y
+3
-3
arch/mips/configs/ip32_defconfig
+3
-3
arch/mips/configs/ip32_defconfig
···
89
89
CONFIG_EXT2_FS_XATTR=y
90
90
CONFIG_EXT2_FS_POSIX_ACL=y
91
91
CONFIG_EXT2_FS_SECURITY=y
92
-
CONFIG_EXT3_FS=y
93
-
CONFIG_EXT3_FS_POSIX_ACL=y
94
-
CONFIG_EXT3_FS_SECURITY=y
92
+
CONFIG_EXT4_FS=y
93
+
CONFIG_EXT4_FS_POSIX_ACL=y
94
+
CONFIG_EXT4_FS_SECURITY=y
95
95
CONFIG_QUOTA=y
96
96
CONFIG_QFMT_V1=m
97
97
CONFIG_QFMT_V2=m
+1
-1
arch/mips/configs/jazz_defconfig
+1
-1
arch/mips/configs/jazz_defconfig
+3
-3
arch/mips/configs/lemote2f_defconfig
+3
-3
arch/mips/configs/lemote2f_defconfig
···
226
226
CONFIG_LEDS_CLASS=y
227
227
CONFIG_STAGING=y
228
228
CONFIG_EXT2_FS=m
229
-
CONFIG_EXT3_FS=y
230
-
CONFIG_EXT3_FS_POSIX_ACL=y
231
-
CONFIG_EXT3_FS_SECURITY=y
229
+
CONFIG_EXT4_FS=y
230
+
CONFIG_EXT4_FS_POSIX_ACL=y
231
+
CONFIG_EXT4_FS_SECURITY=y
232
232
CONFIG_JFS_FS=m
233
233
CONFIG_JFS_POSIX_ACL=y
234
234
CONFIG_XFS_FS=m
+3
-3
arch/mips/configs/loongson2k_defconfig
+3
-3
arch/mips/configs/loongson2k_defconfig
···
298
298
CONFIG_EXT2_FS_XATTR=y
299
299
CONFIG_EXT2_FS_POSIX_ACL=y
300
300
CONFIG_EXT2_FS_SECURITY=y
301
-
CONFIG_EXT3_FS=y
302
-
CONFIG_EXT3_FS_POSIX_ACL=y
303
-
CONFIG_EXT3_FS_SECURITY=y
301
+
CONFIG_EXT4_FS=y
302
+
CONFIG_EXT4_FS_POSIX_ACL=y
303
+
CONFIG_EXT4_FS_SECURITY=y
304
304
CONFIG_XFS_FS=y
305
305
CONFIG_XFS_QUOTA=y
306
306
CONFIG_XFS_POSIX_ACL=y
+3
-3
arch/mips/configs/loongson3_defconfig
+3
-3
arch/mips/configs/loongson3_defconfig
···
348
348
CONFIG_EXT2_FS_XATTR=y
349
349
CONFIG_EXT2_FS_POSIX_ACL=y
350
350
CONFIG_EXT2_FS_SECURITY=y
351
-
CONFIG_EXT3_FS=y
352
-
CONFIG_EXT3_FS_POSIX_ACL=y
353
-
CONFIG_EXT3_FS_SECURITY=y
351
+
CONFIG_EXT4_FS=y
352
+
CONFIG_EXT4_FS_POSIX_ACL=y
353
+
CONFIG_EXT4_FS_SECURITY=y
354
354
CONFIG_XFS_FS=y
355
355
CONFIG_XFS_POSIX_ACL=y
356
356
CONFIG_QUOTA=y
+1
-1
arch/mips/configs/malta_defconfig
+1
-1
arch/mips/configs/malta_defconfig
+1
-1
arch/mips/configs/malta_kvm_defconfig
+1
-1
arch/mips/configs/malta_kvm_defconfig
+1
-1
arch/mips/configs/malta_qemu_32r6_defconfig
+1
-1
arch/mips/configs/malta_qemu_32r6_defconfig
+1
-1
arch/mips/configs/maltaaprp_defconfig
+1
-1
arch/mips/configs/maltaaprp_defconfig
+3
-3
arch/mips/configs/maltasmvp_defconfig
+3
-3
arch/mips/configs/maltasmvp_defconfig
···
148
148
CONFIG_RTC_CLASS=y
149
149
CONFIG_RTC_DRV_CMOS=y
150
150
CONFIG_EXT2_FS=y
151
-
CONFIG_EXT3_FS=y
152
-
CONFIG_EXT3_FS_POSIX_ACL=y
153
-
CONFIG_EXT3_FS_SECURITY=y
151
+
CONFIG_EXT4_FS=y
152
+
CONFIG_EXT4_FS_POSIX_ACL=y
153
+
CONFIG_EXT4_FS_SECURITY=y
154
154
CONFIG_XFS_FS=y
155
155
CONFIG_XFS_QUOTA=y
156
156
CONFIG_XFS_POSIX_ACL=y
+1
-1
arch/mips/configs/maltasmvp_eva_defconfig
+1
-1
arch/mips/configs/maltasmvp_eva_defconfig
+1
-1
arch/mips/configs/maltaup_defconfig
+1
-1
arch/mips/configs/maltaup_defconfig
+1
-1
arch/mips/configs/maltaup_xpa_defconfig
+1
-1
arch/mips/configs/maltaup_xpa_defconfig
+3
-3
arch/mips/configs/mtx1_defconfig
+3
-3
arch/mips/configs/mtx1_defconfig
···
595
595
CONFIG_EXT2_FS_XATTR=y
596
596
CONFIG_EXT2_FS_POSIX_ACL=y
597
597
CONFIG_EXT2_FS_SECURITY=y
598
-
CONFIG_EXT3_FS=m
599
-
CONFIG_EXT3_FS_POSIX_ACL=y
600
-
CONFIG_EXT3_FS_SECURITY=y
598
+
CONFIG_EXT4_FS=m
599
+
CONFIG_EXT4_FS_POSIX_ACL=y
600
+
CONFIG_EXT4_FS_SECURITY=y
601
601
CONFIG_QUOTA=y
602
602
CONFIG_AUTOFS_FS=y
603
603
CONFIG_FUSE_FS=m
+1
-1
arch/mips/configs/rm200_defconfig
+1
-1
arch/mips/configs/rm200_defconfig
+1
-1
arch/openrisc/configs/or1klitex_defconfig
+1
-1
arch/openrisc/configs/or1klitex_defconfig
+2
-2
arch/openrisc/configs/virt_defconfig
+2
-2
arch/openrisc/configs/virt_defconfig
+2
-2
arch/parisc/configs/generic-32bit_defconfig
+2
-2
arch/parisc/configs/generic-32bit_defconfig
+2
-2
arch/parisc/configs/generic-64bit_defconfig
+2
-2
arch/parisc/configs/generic-64bit_defconfig
+3
-3
arch/sh/configs/ap325rxa_defconfig
+3
-3
arch/sh/configs/ap325rxa_defconfig
···
81
81
CONFIG_EXT2_FS_XATTR=y
82
82
CONFIG_EXT2_FS_POSIX_ACL=y
83
83
CONFIG_EXT2_FS_SECURITY=y
84
-
CONFIG_EXT3_FS=y
84
+
CONFIG_EXT4_FS=y
85
85
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
86
-
CONFIG_EXT3_FS_POSIX_ACL=y
87
-
CONFIG_EXT3_FS_SECURITY=y
86
+
CONFIG_EXT4_FS_POSIX_ACL=y
87
+
CONFIG_EXT4_FS_SECURITY=y
88
88
CONFIG_VFAT_FS=y
89
89
CONFIG_PROC_KCORE=y
90
90
CONFIG_TMPFS=y
+1
-1
arch/sh/configs/apsh4a3a_defconfig
+1
-1
arch/sh/configs/apsh4a3a_defconfig
+1
-1
arch/sh/configs/apsh4ad0a_defconfig
+1
-1
arch/sh/configs/apsh4ad0a_defconfig
+3
-3
arch/sh/configs/ecovec24_defconfig
+3
-3
arch/sh/configs/ecovec24_defconfig
···
109
109
CONFIG_EXT2_FS_XATTR=y
110
110
CONFIG_EXT2_FS_POSIX_ACL=y
111
111
CONFIG_EXT2_FS_SECURITY=y
112
-
CONFIG_EXT3_FS=y
112
+
CONFIG_EXT4_FS=y
113
113
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
114
-
CONFIG_EXT3_FS_POSIX_ACL=y
115
-
CONFIG_EXT3_FS_SECURITY=y
114
+
CONFIG_EXT4_FS_POSIX_ACL=y
115
+
CONFIG_EXT4_FS_SECURITY=y
116
116
CONFIG_VFAT_FS=y
117
117
CONFIG_PROC_KCORE=y
118
118
CONFIG_TMPFS=y
+1
-1
arch/sh/configs/edosk7760_defconfig
+1
-1
arch/sh/configs/edosk7760_defconfig
+1
-1
arch/sh/configs/espt_defconfig
+1
-1
arch/sh/configs/espt_defconfig
+1
-1
arch/sh/configs/landisk_defconfig
+1
-1
arch/sh/configs/landisk_defconfig
+1
-1
arch/sh/configs/lboxre2_defconfig
+1
-1
arch/sh/configs/lboxre2_defconfig
+2
-2
arch/sh/configs/magicpanelr2_defconfig
+2
-2
arch/sh/configs/magicpanelr2_defconfig
···
64
64
# CONFIG_RTC_HCTOSYS is not set
65
65
CONFIG_RTC_DRV_SH=y
66
66
CONFIG_EXT2_FS=y
67
-
CONFIG_EXT3_FS=y
67
+
CONFIG_EXT4_FS=y
68
68
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
69
-
# CONFIG_EXT3_FS_XATTR is not set
69
+
# CONFIG_EXT4_FS_XATTR is not set
70
70
# CONFIG_DNOTIFY is not set
71
71
CONFIG_PROC_KCORE=y
72
72
CONFIG_TMPFS=y
+1
-1
arch/sh/configs/r7780mp_defconfig
+1
-1
arch/sh/configs/r7780mp_defconfig
+1
-1
arch/sh/configs/r7785rp_defconfig
+1
-1
arch/sh/configs/r7785rp_defconfig
+1
-1
arch/sh/configs/rsk7264_defconfig
+1
-1
arch/sh/configs/rsk7264_defconfig
+1
-1
arch/sh/configs/rsk7269_defconfig
+1
-1
arch/sh/configs/rsk7269_defconfig
+2
-2
arch/sh/configs/sdk7780_defconfig
+2
-2
arch/sh/configs/sdk7780_defconfig
···
102
102
CONFIG_EXT2_FS=y
103
103
CONFIG_EXT2_FS_XATTR=y
104
104
CONFIG_EXT2_FS_POSIX_ACL=y
105
-
CONFIG_EXT3_FS=y
105
+
CONFIG_EXT4_FS=y
106
106
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
107
-
CONFIG_EXT3_FS_POSIX_ACL=y
107
+
CONFIG_EXT4_FS_POSIX_ACL=y
108
108
CONFIG_AUTOFS_FS=y
109
109
CONFIG_ISO9660_FS=y
110
110
CONFIG_MSDOS_FS=y
+1
-1
arch/sh/configs/sdk7786_defconfig
+1
-1
arch/sh/configs/sdk7786_defconfig
+1
-1
arch/sh/configs/se7343_defconfig
+1
-1
arch/sh/configs/se7343_defconfig
+1
-1
arch/sh/configs/se7712_defconfig
+1
-1
arch/sh/configs/se7712_defconfig
+1
-1
arch/sh/configs/se7721_defconfig
+1
-1
arch/sh/configs/se7721_defconfig
+1
-1
arch/sh/configs/se7722_defconfig
+1
-1
arch/sh/configs/se7722_defconfig
+3
-3
arch/sh/configs/se7724_defconfig
+3
-3
arch/sh/configs/se7724_defconfig
···
110
110
CONFIG_EXT2_FS_XATTR=y
111
111
CONFIG_EXT2_FS_POSIX_ACL=y
112
112
CONFIG_EXT2_FS_SECURITY=y
113
-
CONFIG_EXT3_FS=y
113
+
CONFIG_EXT4_FS=y
114
114
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
115
-
CONFIG_EXT3_FS_POSIX_ACL=y
116
-
CONFIG_EXT3_FS_SECURITY=y
115
+
CONFIG_EXT4_FS_POSIX_ACL=y
116
+
CONFIG_EXT4_FS_SECURITY=y
117
117
CONFIG_VFAT_FS=y
118
118
CONFIG_PROC_KCORE=y
119
119
CONFIG_TMPFS=y
+2
-2
arch/sh/configs/sh03_defconfig
+2
-2
arch/sh/configs/sh03_defconfig
···
57
57
CONFIG_SH_WDT=m
58
58
CONFIG_EXT2_FS=y
59
59
CONFIG_EXT2_FS_XATTR=y
60
-
CONFIG_EXT3_FS=y
60
+
CONFIG_EXT4_FS=y
61
61
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
62
-
CONFIG_EXT3_FS_POSIX_ACL=y
62
+
CONFIG_EXT4_FS_POSIX_ACL=y
63
63
CONFIG_AUTOFS_FS=y
64
64
CONFIG_ISO9660_FS=m
65
65
CONFIG_JOLIET=y
+1
-1
arch/sh/configs/sh2007_defconfig
+1
-1
arch/sh/configs/sh2007_defconfig
+1
-1
arch/sh/configs/sh7757lcr_defconfig
+1
-1
arch/sh/configs/sh7757lcr_defconfig
+1
-1
arch/sh/configs/sh7763rdp_defconfig
+1
-1
arch/sh/configs/sh7763rdp_defconfig
+1
-1
arch/sh/configs/sh7785lcr_32bit_defconfig
+1
-1
arch/sh/configs/sh7785lcr_32bit_defconfig
+1
-1
arch/sh/configs/sh7785lcr_defconfig
+1
-1
arch/sh/configs/sh7785lcr_defconfig
+1
-1
arch/sh/configs/shx3_defconfig
+1
-1
arch/sh/configs/shx3_defconfig
+2
-2
arch/sh/configs/titan_defconfig
+2
-2
arch/sh/configs/titan_defconfig
···
215
215
CONFIG_RTC_CLASS=y
216
216
CONFIG_RTC_DRV_SH=m
217
217
CONFIG_EXT2_FS=y
218
-
CONFIG_EXT3_FS=y
218
+
CONFIG_EXT4_FS=y
219
219
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
220
-
# CONFIG_EXT3_FS_XATTR is not set
220
+
# CONFIG_EXT4_FS_XATTR is not set
221
221
CONFIG_XFS_FS=m
222
222
CONFIG_FUSE_FS=m
223
223
CONFIG_ISO9660_FS=m
+1
-1
arch/sh/configs/ul2_defconfig
+1
-1
arch/sh/configs/ul2_defconfig
+1
-1
arch/sh/configs/urquell_defconfig
+1
-1
arch/sh/configs/urquell_defconfig
+3
-3
arch/sparc/configs/sparc64_defconfig
+3
-3
arch/sparc/configs/sparc64_defconfig
···
187
187
CONFIG_EXT2_FS_XATTR=y
188
188
CONFIG_EXT2_FS_POSIX_ACL=y
189
189
CONFIG_EXT2_FS_SECURITY=y
190
-
CONFIG_EXT3_FS=y
190
+
CONFIG_EXT4_FS=y
191
191
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
192
-
CONFIG_EXT3_FS_POSIX_ACL=y
193
-
CONFIG_EXT3_FS_SECURITY=y
192
+
CONFIG_EXT4_FS_POSIX_ACL=y
193
+
CONFIG_EXT4_FS_SECURITY=y
194
194
CONFIG_PROC_KCORE=y
195
195
CONFIG_TMPFS=y
196
196
CONFIG_HUGETLBFS=y
+1
-1
arch/xtensa/configs/audio_kc705_defconfig
+1
-1
arch/xtensa/configs/audio_kc705_defconfig
+1
-1
arch/xtensa/configs/cadence_csp_defconfig
+1
-1
arch/xtensa/configs/cadence_csp_defconfig
+1
-1
arch/xtensa/configs/generic_kc705_defconfig
+1
-1
arch/xtensa/configs/generic_kc705_defconfig
+1
-1
arch/xtensa/configs/nommu_kc705_defconfig
+1
-1
arch/xtensa/configs/nommu_kc705_defconfig
+1
-1
arch/xtensa/configs/smp_lx200_defconfig
+1
-1
arch/xtensa/configs/smp_lx200_defconfig
+1
-1
arch/xtensa/configs/virt_defconfig
+1
-1
arch/xtensa/configs/virt_defconfig
+1
-1
arch/xtensa/configs/xip_kc705_defconfig
+1
-1
arch/xtensa/configs/xip_kc705_defconfig
+9
-2
fs/ext4/ext4_jbd2.c
+9
-2
fs/ext4/ext4_jbd2.c
···
280
280
bh, is_metadata, inode->i_mode,
281
281
test_opt(inode->i_sb, DATA_FLAGS));
282
282
283
-
/* In the no journal case, we can just do a bforget and return */
283
+
/*
284
+
* In the no journal case, we should wait for the ongoing buffer
285
+
* to complete and do a forget.
286
+
*/
284
287
if (!ext4_handle_valid(handle)) {
285
-
bforget(bh);
288
+
if (bh) {
289
+
clear_buffer_dirty(bh);
290
+
wait_on_buffer(bh);
291
+
__bforget(bh);
292
+
}
286
293
return 0;
287
294
}
288
295
+8
fs/ext4/inode.c
+8
fs/ext4/inode.c
···
5319
5319
}
5320
5320
ei->i_flags = le32_to_cpu(raw_inode->i_flags);
5321
5321
ext4_set_inode_flags(inode, true);
5322
+
/* Detect invalid flag combination - can't have both inline data and extents */
5323
+
if (ext4_test_inode_flag(inode, EXT4_INODE_INLINE_DATA) &&
5324
+
ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
5325
+
ext4_error_inode(inode, function, line, 0,
5326
+
"inode has both inline data and extents flags");
5327
+
ret = -EFSCORRUPTED;
5328
+
goto bad_inode;
5329
+
}
5322
5330
inode->i_blocks = ext4_inode_blocks(raw_inode, ei);
5323
5331
ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl_lo);
5324
5332
if (ext4_has_feature_64bit(sb))
+2
-2
fs/ext4/orphan.c
+2
-2
fs/ext4/orphan.c
···
513
513
return;
514
514
for (i = 0; i < oi->of_blocks; i++)
515
515
brelse(oi->of_binfo[i].ob_bh);
516
-
kfree(oi->of_binfo);
516
+
kvfree(oi->of_binfo);
517
517
}
518
518
519
519
static struct ext4_orphan_block_tail *ext4_orphan_block_tail(
···
637
637
out_free:
638
638
for (i--; i >= 0; i--)
639
639
brelse(oi->of_binfo[i].ob_bh);
640
-
kfree(oi->of_binfo);
640
+
kvfree(oi->of_binfo);
641
641
out_put:
642
642
iput(inode);
643
643
return ret;
+9
-4
fs/jbd2/transaction.c
+9
-4
fs/jbd2/transaction.c
···
1659
1659
int drop_reserve = 0;
1660
1660
int err = 0;
1661
1661
int was_modified = 0;
1662
+
int wait_for_writeback = 0;
1662
1663
1663
1664
if (is_handle_aborted(handle))
1664
1665
return -EROFS;
···
1783
1782
}
1784
1783
1785
1784
/*
1786
-
* The buffer is still not written to disk, we should
1787
-
* attach this buffer to current transaction so that the
1788
-
* buffer can be checkpointed only after the current
1789
-
* transaction commits.
1785
+
* The buffer has not yet been written to disk. We should
1786
+
* either clear the buffer or ensure that the ongoing I/O
1787
+
* is completed, and attach this buffer to current
1788
+
* transaction so that the buffer can be checkpointed only
1789
+
* after the current transaction commits.
1790
1790
*/
1791
1791
clear_buffer_dirty(bh);
1792
+
wait_for_writeback = 1;
1792
1793
__jbd2_journal_file_buffer(jh, transaction, BJ_Forget);
1793
1794
spin_unlock(&journal->j_list_lock);
1794
1795
}
1795
1796
drop:
1796
1797
__brelse(bh);
1797
1798
spin_unlock(&jh->b_state_lock);
1799
+
if (wait_for_writeback)
1800
+
wait_on_buffer(bh);
1798
1801
jbd2_journal_put_journal_head(jh);
1799
1802
if (drop_reserve) {
1800
1803
/* no need to reserve log space for this block -bzzz */