diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2023-03-07 23:15:49 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2023-03-11 00:44:24 -0500 |
| commit | 62913ae96de747091c4dacd06d158e7729c1a76d (patch) | |
| tree | b8216b43eed65fb2f7ddbedb9bdb7697a890b861 /fs/jbd2 | |
| parent | 2b96b4a5d9443ca4cad58b0040be455803c05a42 (diff) | |
| download | linux-62913ae96de747091c4dacd06d158e7729c1a76d.tar.gz | |
ext4, jbd2: add an optimized bmap for the journal inode
The generic bmap() function exported by the VFS takes locks and does
checks that are not necessary for the journal inode. So allow the
file system to set a journal-optimized bmap function in
journal->j_bmap.
Reported-by: syzbot+9543479984ae9e576000@syzkaller.appspotmail.com
Link: https://syzkaller.appspot.com/bug?id=e4aaa78795e490421c79f76ec3679006c8ff4cf0
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/journal.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 2696f43e7239f..c84f588fdcd03 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -970,10 +970,13 @@ int jbd2_journal_bmap(journal_t *journal, unsigned long blocknr, { int err = 0; unsigned long long ret; - sector_t block = 0; + sector_t block = blocknr; - if (journal->j_inode) { - block = blocknr; + if (journal->j_bmap) { + err = journal->j_bmap(journal, &block); + if (err == 0) + *retp = block; + } else if (journal->j_inode) { ret = bmap(journal->j_inode, &block); if (ret || !block) { |