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

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

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://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  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) ...@@ -446,7 +446,8 @@ int __log_start_commit(journal_t *journal, tid_t target)
* currently running transaction (if it exists). Otherwise, * currently running transaction (if it exists). Otherwise,
* the target tid must be an old one. * 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) { journal->j_running_transaction->t_tid == target) {
/* /*
* We want a new commit: OK, mark the request and wakeup the * 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) ...@@ -307,7 +307,8 @@ static void udf_sb_free_partitions(struct super_block *sb)
{ {
struct udf_sb_info *sbi = UDF_SB(sb); struct udf_sb_info *sbi = UDF_SB(sb);
int i; int i;
if (sbi->s_partmaps == NULL)
return;
for (i = 0; i < sbi->s_partitions; i++) for (i = 0; i < sbi->s_partitions; i++)
udf_free_partition(&sbi->s_partmaps[i]); udf_free_partition(&sbi->s_partmaps[i]);
kfree(sbi->s_partmaps); kfree(sbi->s_partmaps);
......
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