Commit 31db7206 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for_linus' of git://

Pull ext3 and udf fixes from Jan Kara:
 "One ext3 performance regression fix and one udf regression fix (oops
  on interrupted mount)."

* 'for_linus' of git://
  UDF: Fix a null pointer dereference in udf_sb_free_partitions
  jbd: don't wake kjournald unnecessarily
parents 56400b55 1b1baff6
......@@ -446,7 +446,8 @@ int __log_start_commit(journal_t *journal, tid_t target)
* currently running transaction (if it exists). Otherwise,
* the target tid must be an old one.
if (journal->j_running_transaction &&
if (journal->j_commit_request != target &&
journal->j_running_transaction &&
journal->j_running_transaction->t_tid == target) {
* We want a new commit: OK, mark the request and wakeup the
......@@ -307,7 +307,8 @@ static void udf_sb_free_partitions(struct super_block *sb)
struct udf_sb_info *sbi = UDF_SB(sb);
int i;
if (sbi->s_partmaps == NULL)
for (i = 0; i < sbi->s_partitions; i++)
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