diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2021-08-06 12:55:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2021-08-06 12:55:07 -0700 |
| commit | c9194f32bfd932e976a158d1af97a63be68a2aab (patch) | |
| tree | 2c003b0cf9bccd8c1a670f3d45a770414785c45c /fs/ext4/ext4_jbd2.c | |
| parent | Merge tag 'trace-v5.14-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | ext4: fix potential htree corruption when growing large_dir directories (diff) | |
| download | linux-c9194f32bfd932e976a158d1af97a63be68a2aab.tar.gz linux-c9194f32bfd932e976a158d1af97a63be68a2aab.tar.bz2 linux-c9194f32bfd932e976a158d1af97a63be68a2aab.zip | |
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:
"A regression fix, bug fix, and a comment cleanup for ext4"
* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix potential htree corruption when growing large_dir directories
ext4: remove conflicting comment from __ext4_forget
ext4: fix potential uninitialized access to retval in kmmpd
Diffstat (limited to 'fs/ext4/ext4_jbd2.c')
| -rw-r--r-- | fs/ext4/ext4_jbd2.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c index b96ecba91899..b60f0152ea57 100644 --- a/fs/ext4/ext4_jbd2.c +++ b/fs/ext4/ext4_jbd2.c @@ -244,9 +244,6 @@ int __ext4_journal_get_write_access(const char *where, unsigned int line, * "bh" may be NULL: a metadata block may have been freed from memory * but there may still be a record of it in the journal, and that record * still needs to be revoked. - * - * If the handle isn't valid we're not journaling, but we still need to - * call into ext4_journal_revoke() to put the buffer head. */ int __ext4_forget(const char *where, unsigned int line, handle_t *handle, int is_metadata, struct inode *inode, |