aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/jbd2/journal.c18
-rw-r--r--fs/jbd2/revoke.c2
-rw-r--r--fs/jbd2/transaction.c4
3 files changed, 12 insertions, 12 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 64356e85a10f..53632e3e8457 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -534,7 +534,7 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid)
534 if (!tid_geq(journal->j_commit_request, tid)) { 534 if (!tid_geq(journal->j_commit_request, tid)) {
535 printk(KERN_EMERG 535 printk(KERN_EMERG
536 "%s: error: j_commit_request=%d, tid=%d\n", 536 "%s: error: j_commit_request=%d, tid=%d\n",
537 __FUNCTION__, journal->j_commit_request, tid); 537 __func__, journal->j_commit_request, tid);
538 } 538 }
539 spin_unlock(&journal->j_state_lock); 539 spin_unlock(&journal->j_state_lock);
540#endif 540#endif
@@ -599,7 +599,7 @@ int jbd2_journal_bmap(journal_t *journal, unsigned long blocknr,
599 599
600 printk(KERN_ALERT "%s: journal block not found " 600 printk(KERN_ALERT "%s: journal block not found "
601 "at offset %lu on %s\n", 601 "at offset %lu on %s\n",
602 __FUNCTION__, 602 __func__,
603 blocknr, 603 blocknr,
604 bdevname(journal->j_dev, b)); 604 bdevname(journal->j_dev, b));
605 err = -EIO; 605 err = -EIO;
@@ -1028,7 +1028,7 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev,
1028 journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL); 1028 journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL);
1029 if (!journal->j_wbuf) { 1029 if (!journal->j_wbuf) {
1030 printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", 1030 printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n",
1031 __FUNCTION__); 1031 __func__);
1032 kfree(journal); 1032 kfree(journal);
1033 journal = NULL; 1033 journal = NULL;
1034 goto out; 1034 goto out;
@@ -1084,7 +1084,7 @@ journal_t * jbd2_journal_init_inode (struct inode *inode)
1084 journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL); 1084 journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL);
1085 if (!journal->j_wbuf) { 1085 if (!journal->j_wbuf) {
1086 printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", 1086 printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n",
1087 __FUNCTION__); 1087 __func__);
1088 kfree(journal); 1088 kfree(journal);
1089 return NULL; 1089 return NULL;
1090 } 1090 }
@@ -1093,7 +1093,7 @@ journal_t * jbd2_journal_init_inode (struct inode *inode)
1093 /* If that failed, give up */ 1093 /* If that failed, give up */
1094 if (err) { 1094 if (err) {
1095 printk(KERN_ERR "%s: Cannnot locate journal superblock\n", 1095 printk(KERN_ERR "%s: Cannnot locate journal superblock\n",
1096 __FUNCTION__); 1096 __func__);
1097 kfree(journal); 1097 kfree(journal);
1098 return NULL; 1098 return NULL;
1099 } 1099 }
@@ -1179,7 +1179,7 @@ int jbd2_journal_create(journal_t *journal)
1179 */ 1179 */
1180 printk(KERN_EMERG 1180 printk(KERN_EMERG
1181 "%s: creation of journal on external device!\n", 1181 "%s: creation of journal on external device!\n",
1182 __FUNCTION__); 1182 __func__);
1183 BUG(); 1183 BUG();
1184 } 1184 }
1185 1185
@@ -1999,7 +1999,7 @@ static struct journal_head *journal_alloc_journal_head(void)
1999 jbd_debug(1, "out of memory for journal_head\n"); 1999 jbd_debug(1, "out of memory for journal_head\n");
2000 if (time_after(jiffies, last_warning + 5*HZ)) { 2000 if (time_after(jiffies, last_warning + 5*HZ)) {
2001 printk(KERN_NOTICE "ENOMEM in %s, retrying.\n", 2001 printk(KERN_NOTICE "ENOMEM in %s, retrying.\n",
2002 __FUNCTION__); 2002 __func__);
2003 last_warning = jiffies; 2003 last_warning = jiffies;
2004 } 2004 }
2005 while (!ret) { 2005 while (!ret) {
@@ -2136,13 +2136,13 @@ static void __journal_remove_journal_head(struct buffer_head *bh)
2136 if (jh->b_frozen_data) { 2136 if (jh->b_frozen_data) {
2137 printk(KERN_WARNING "%s: freeing " 2137 printk(KERN_WARNING "%s: freeing "
2138 "b_frozen_data\n", 2138 "b_frozen_data\n",
2139 __FUNCTION__); 2139 __func__);
2140 jbd2_free(jh->b_frozen_data, bh->b_size); 2140 jbd2_free(jh->b_frozen_data, bh->b_size);
2141 } 2141 }
2142 if (jh->b_committed_data) { 2142 if (jh->b_committed_data) {
2143 printk(KERN_WARNING "%s: freeing " 2143 printk(KERN_WARNING "%s: freeing "
2144 "b_committed_data\n", 2144 "b_committed_data\n",
2145 __FUNCTION__); 2145 __func__);
2146 jbd2_free(jh->b_committed_data, bh->b_size); 2146 jbd2_free(jh->b_committed_data, bh->b_size);
2147 } 2147 }
2148 bh->b_private = NULL; 2148 bh->b_private = NULL;
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c
index 144a2065f03e..257ff2625765 100644
--- a/fs/jbd2/revoke.c
+++ b/fs/jbd2/revoke.c
@@ -139,7 +139,7 @@ repeat:
139oom: 139oom:
140 if (!journal_oom_retry) 140 if (!journal_oom_retry)
141 return -ENOMEM; 141 return -ENOMEM;
142 jbd_debug(1, "ENOMEM in %s, retrying\n", __FUNCTION__); 142 jbd_debug(1, "ENOMEM in %s, retrying\n", __func__);
143 yield(); 143 yield();
144 goto repeat; 144 goto repeat;
145} 145}
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 401bf9d23656..d6e006e67804 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -696,7 +696,7 @@ repeat:
696 if (!frozen_buffer) { 696 if (!frozen_buffer) {
697 printk(KERN_EMERG 697 printk(KERN_EMERG
698 "%s: OOM for frozen_buffer\n", 698 "%s: OOM for frozen_buffer\n",
699 __FUNCTION__); 699 __func__);
700 JBUFFER_TRACE(jh, "oom!"); 700 JBUFFER_TRACE(jh, "oom!");
701 error = -ENOMEM; 701 error = -ENOMEM;
702 jbd_lock_bh_state(bh); 702 jbd_lock_bh_state(bh);
@@ -914,7 +914,7 @@ repeat:
914 committed_data = jbd2_alloc(jh2bh(jh)->b_size, GFP_NOFS); 914 committed_data = jbd2_alloc(jh2bh(jh)->b_size, GFP_NOFS);
915 if (!committed_data) { 915 if (!committed_data) {
916 printk(KERN_EMERG "%s: No memory for committed data\n", 916 printk(KERN_EMERG "%s: No memory for committed data\n",
917 __FUNCTION__); 917 __func__);
918 err = -ENOMEM; 918 err = -ENOMEM;
919 goto out; 919 goto out;
920 } 920 }