diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-16 10:55:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-16 10:55:10 -0800 |
| commit | 31db720643073571f15eede808486371556f6380 (patch) | |
| tree | ff3d46c6741e5de87424fe4f4d1dc914b6ad0a41 | |
| parent | 56400b55c0ba02a8abecbc541193ea6a309635ce (diff) | |
| parent | 1b1baff6e50df855238ce5e6c0e7dbb8a261fb32 (diff) | |
| download | linux-3.10-31db720643073571f15eede808486371556f6380.tar.gz linux-3.10-31db720643073571f15eede808486371556f6380.tar.bz2 linux-3.10-31db720643073571f15eede808486371556f6380.zip | |
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
| -rw-r--r-- | fs/jbd/journal.c | 3 | ||||
| -rw-r--r-- | fs/udf/super.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index a2862339323..81cc7eaff86 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c @@ -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 diff --git a/fs/udf/super.c b/fs/udf/super.c index d44fb568abe..e9be396a558 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -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) + return; for (i = 0; i < sbi->s_partitions; i++) udf_free_partition(&sbi->s_partmaps[i]); kfree(sbi->s_partmaps); |