Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

jbd: replace remaining __FUNCTION__ occurrences

Browse source 
__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Harvey Harrison 2008-04-28 02:16:16 -07:00 committed by Linus Torvalds
parent e05b6b524b
commit 08fc99bfc3
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fs/jbd/journal.c
View file

@ -534,7 +534,7 @@ int log_wait_commit(journal_t *journal, tid_t tid)
if (!tid_geq(journal->j_commit_request, tid)) { if (!tid_geq(journal->j_commit_request, tid)) {
printk(KERN_EMERG printk(KERN_EMERG
"%s: error: j_commit_request=%d, tid=%d\n", "%s: error: j_commit_request=%d, tid=%d\n",
__FUNCTION__, journal->j_commit_request, tid); __func__, journal->j_commit_request, tid);
} }
spin_unlock(&journal->j_state_lock); spin_unlock(&journal->j_state_lock);
#endif #endif
@ -599,7 +599,7 @@ int journal_bmap(journal_t *journal, unsigned long blocknr,
printk(KERN_ALERT "%s: journal block not found " printk(KERN_ALERT "%s: journal block not found "
"at offset %lu on %s\n", "at offset %lu on %s\n",
__FUNCTION__, __func__,
blocknr, blocknr,
bdevname(journal->j_dev, b)); bdevname(journal->j_dev, b));
err = -EIO; err = -EIO;
@ -728,7 +728,7 @@ journal_t * journal_init_dev(struct block_device *bdev,
journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL); journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL);
if (!journal->j_wbuf) { if (!journal->j_wbuf) {
printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n",
__FUNCTION__); __func__);
kfree(journal); kfree(journal);
journal = NULL; journal = NULL;
goto out; goto out;
@ -782,7 +782,7 @@ journal_t * journal_init_inode (struct inode *inode)
journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL); journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL);
if (!journal->j_wbuf) { if (!journal->j_wbuf) {
printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n",
__FUNCTION__); __func__);
kfree(journal); kfree(journal);
return NULL; return NULL;
} }
@ -791,7 +791,7 @@ journal_t * journal_init_inode (struct inode *inode)
/* If that failed, give up */ /* If that failed, give up */
if (err) { if (err) {
printk(KERN_ERR "%s: Cannnot locate journal superblock\n", printk(KERN_ERR "%s: Cannnot locate journal superblock\n",
__FUNCTION__); __func__);
kfree(journal); kfree(journal);
return NULL; return NULL;
} }
@ -877,7 +877,7 @@ int journal_create(journal_t *journal)
*/ */
printk(KERN_EMERG printk(KERN_EMERG
"%s: creation of journal on external device!\n", "%s: creation of journal on external device!\n",
__FUNCTION__); __func__);
BUG(); BUG();
} }
@ -1657,7 +1657,7 @@ static struct journal_head *journal_alloc_journal_head(void)
jbd_debug(1, "out of memory for journal_head\n"); jbd_debug(1, "out of memory for journal_head\n");
if (time_after(jiffies, last_warning + 5*HZ)) { if (time_after(jiffies, last_warning + 5*HZ)) {
printk(KERN_NOTICE "ENOMEM in %s, retrying.\n", printk(KERN_NOTICE "ENOMEM in %s, retrying.\n",
__FUNCTION__); __func__);
last_warning = jiffies; last_warning = jiffies;
} }
while (ret == NULL) { while (ret == NULL) {
@ -1794,13 +1794,13 @@ static void __journal_remove_journal_head(struct buffer_head *bh)
if (jh->b_frozen_data) { if (jh->b_frozen_data) {
printk(KERN_WARNING "%s: freeing " printk(KERN_WARNING "%s: freeing "
"b_frozen_data\n", "b_frozen_data\n",
__FUNCTION__); __func__);
jbd_free(jh->b_frozen_data, bh->b_size); jbd_free(jh->b_frozen_data, bh->b_size);
} }
if (jh->b_committed_data) { if (jh->b_committed_data) {
printk(KERN_WARNING "%s: freeing " printk(KERN_WARNING "%s: freeing "
"b_committed_data\n", "b_committed_data\n",
__FUNCTION__); __func__);
jbd_free(jh->b_committed_data, bh->b_size); jbd_free(jh->b_committed_data, bh->b_size);
} }
bh->b_private = NULL; bh->b_private = NULL;

2
fs/jbd/revoke.c
View file

@ -138,7 +138,7 @@ static int insert_revoke_hash(journal_t *journal, unsigned long blocknr,
oom: oom:
if (!journal_oom_retry) if (!journal_oom_retry)
return -ENOMEM; return -ENOMEM;
jbd_debug(1, "ENOMEM in %s, retrying\n", __FUNCTION__); jbd_debug(1, "ENOMEM in %s, retrying\n", __func__);
yield(); yield();
goto repeat; goto repeat;
} }

4
fs/jbd/transaction.c
View file

@ -687,7 +687,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh,
if (!frozen_buffer) { if (!frozen_buffer) {
printk(KERN_EMERG printk(KERN_EMERG
"%s: OOM for frozen_buffer\n", "%s: OOM for frozen_buffer\n",
__FUNCTION__); __func__);
JBUFFER_TRACE(jh, "oom!"); JBUFFER_TRACE(jh, "oom!");
error = -ENOMEM; error = -ENOMEM;
jbd_lock_bh_state(bh); jbd_lock_bh_state(bh);
@ -904,7 +904,7 @@ int journal_get_undo_access(handle_t *handle, struct buffer_head *bh)
committed_data = jbd_alloc(jh2bh(jh)->b_size, GFP_NOFS); committed_data = jbd_alloc(jh2bh(jh)->b_size, GFP_NOFS);
if (!committed_data) { if (!committed_data) {
printk(KERN_EMERG "%s: No memory for committed data\n", printk(KERN_EMERG "%s: No memory for committed data\n",
__FUNCTION__); __func__);
err = -ENOMEM; err = -ENOMEM;
goto out; goto out;
} }