Commit c9194f32 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 2c4b1ec6 877ba3f7
...@@ -244,9 +244,6 @@ int __ext4_journal_get_write_access(const char *where, unsigned int line, ...@@ -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 * "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 * but there may still be a record of it in the journal, and that record
* still needs to be revoked. * 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 __ext4_forget(const char *where, unsigned int line, handle_t *handle,
int is_metadata, struct inode *inode, int is_metadata, struct inode *inode,
......
...@@ -138,7 +138,7 @@ static int kmmpd(void *data) ...@@ -138,7 +138,7 @@ static int kmmpd(void *data)
unsigned mmp_check_interval; unsigned mmp_check_interval;
unsigned long last_update_time; unsigned long last_update_time;
unsigned long diff; unsigned long diff;
int retval; int retval = 0;
mmp_block = le64_to_cpu(es->s_mmp_block); mmp_block = le64_to_cpu(es->s_mmp_block);
mmp = (struct mmp_struct *)(bh->b_data); mmp = (struct mmp_struct *)(bh->b_data);
......
...@@ -2517,7 +2517,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct ext4_filename *fname, ...@@ -2517,7 +2517,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct ext4_filename *fname,
goto journal_error; goto journal_error;
err = ext4_handle_dirty_dx_node(handle, dir, err = ext4_handle_dirty_dx_node(handle, dir,
frame->bh); frame->bh);
if (err) if (restart || err)
goto journal_error; goto journal_error;
} else { } else {
struct dx_root *dxroot; struct dx_root *dxroot;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment