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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Pull UDF & jbd fixes from Jan Kara:
"A cleanup of JBD log messages and UDF fix of a lockdep warning"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
udf: Fix lockdep warning from udf_symlink()
jbd: Revise KERN_EMERG error messages

Linus Torvalds 12 years ago 90804ed6 30b02c4b

+6 -8

3 changed files

expand all

jbd

journal.c

transaction.c

udf

namei.c

+3 -5

fs/jbd/journal.c

··· 573 573 #ifdef CONFIG_JBD_DEBUG 574 574 spin_lock(&journal->j_state_lock); 575 575 if (!tid_geq(journal->j_commit_request, tid)) { 576 - printk(KERN_EMERG 576 + printk(KERN_ERR 577 577 "%s: error: j_commit_request=%d, tid=%d\n", 578 578 __func__, journal->j_commit_request, tid); 579 579 } ··· 604 604 out_unlock: 605 605 spin_unlock(&journal->j_state_lock); 606 606 607 - if (unlikely(is_journal_aborted(journal))) { 608 - printk(KERN_EMERG "journal commit I/O error\n"); 607 + if (unlikely(is_journal_aborted(journal))) 609 608 err = -EIO; 610 - } 611 609 return err; 612 610 } 613 611 ··· 2134 2136 #ifdef CONFIG_JBD_DEBUG 2135 2137 int n = atomic_read(&nr_journal_heads); 2136 2138 if (n) 2137 - printk(KERN_EMERG "JBD: leaked %d journal_heads!\n", n); 2139 + printk(KERN_ERR "JBD: leaked %d journal_heads!\n", n); 2138 2140 #endif 2139 2141 jbd_remove_debugfs_entry(); 2140 2142 journal_destroy_caches();

+2 -2

fs/jbd/transaction.c

··· 675 675 jbd_alloc(jh2bh(jh)->b_size, 676 676 GFP_NOFS); 677 677 if (!frozen_buffer) { 678 - printk(KERN_EMERG 678 + printk(KERN_ERR 679 679 "%s: OOM for frozen_buffer\n", 680 680 __func__); 681 681 JBUFFER_TRACE(jh, "oom!"); ··· 898 898 if (!jh->b_committed_data) { 899 899 committed_data = jbd_alloc(jh2bh(jh)->b_size, GFP_NOFS); 900 900 if (!committed_data) { 901 - printk(KERN_EMERG "%s: No memory for committed data\n", 901 + printk(KERN_ERR "%s: No memory for committed data\n", 902 902 __func__); 903 903 err = -ENOMEM; 904 904 goto out;

+1 -1

fs/udf/namei.c

··· 1010 1010 else 1011 1011 udf_truncate_tail_extent(inode); 1012 1012 mark_inode_dirty(inode); 1013 + up_write(&iinfo->i_data_sem); 1013 1014 1014 1015 fi = udf_add_entry(dir, dentry, &fibh, &cfi, &err); 1015 1016 if (!fi) ··· 1024 1023 udf_write_fi(dir, &cfi, fi, &fibh, NULL, NULL); 1025 1024 if (UDF_I(dir)->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) 1026 1025 mark_inode_dirty(dir); 1027 - up_write(&iinfo->i_data_sem); 1028 1026 if (fibh.sbh != fibh.ebh) 1029 1027 brelse(fibh.ebh); 1030 1028 brelse(fibh.sbh);