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
Showing the changes to include (1 of 13 files). Show all
Unified · Split
| @@ -1308,6 +1308,14 @@ struct journal_s · 1307 unmodified lines | |||
| 1308 | struct buffer_head *bh, | 1308 | struct buffer_head *bh, |
| 1309 | enum passtype pass, int off, | 1309 | enum passtype pass, int off, |
| 1310 | tid_t expected_commit_id); | 1310 | tid_t expected_commit_id); |
| 1311 | |||
| 1312 | /** | ||
| 1313 | * @j_bmap: | ||
| 1314 | * | ||
| 1315 | * Bmap function that should be used instead of the generic | ||
| 1316 | * VFS bmap function. | ||
| 1317 | */ | ||
| 1318 | int (*j_bmap)(struct journal_s *journal, sector_t *block); | ||
| 1311 | }; | 1319 | }; |
| 1312 | 1320 | ||
| 1313 | #define jbd2_might_wait_for_commit(j) \ | 1321 | #define jbd2_might_wait_for_commit(j) \ |