tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 31db7206 56400b55

+4 -2
+2 -1
fs/jbd/journal.c
··· 446 446 * currently running transaction (if it exists). Otherwise, 447 447 * the target tid must be an old one. 448 448 */ 449 - if (journal->j_running_transaction && 449 + if (journal->j_commit_request != target && 450 + journal->j_running_transaction && 450 451 journal->j_running_transaction->t_tid == target) { 451 452 /* 452 453 * We want a new commit: OK, mark the request and wakeup the
+2 -1
fs/udf/super.c
··· 307 307 { 308 308 struct udf_sb_info *sbi = UDF_SB(sb); 309 309 int i; 310 - 310 + if (sbi->s_partmaps == NULL) 311 + return; 311 312 for (i = 0; i < sbi->s_partitions; i++) 312 313 udf_free_partition(&sbi->s_partmaps[i]); 313 314 kfree(sbi->s_partmaps);