jbd: replace remaining __FUNCTION__ occurrences
__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:
parent
e05b6b524b
commit
08fc99bfc3
|
@ -534,7 +534,7 @@ int log_wait_commit(journal_t *journal, tid_t tid)
|
|||
if (!tid_geq(journal->j_commit_request, tid)) {
|
||||
printk(KERN_EMERG
|
||||
"%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);
|
||||
#endif
|
||||
|
@ -599,7 +599,7 @@ int journal_bmap(journal_t *journal, unsigned long blocknr,
|
|||
|
||||
printk(KERN_ALERT "%s: journal block not found "
|
||||
"at offset %lu on %s\n",
|
||||
__FUNCTION__,
|
||||
__func__,
|
||||
blocknr,
|
||||
bdevname(journal->j_dev, b));
|
||||
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);
|
||||
if (!journal->j_wbuf) {
|
||||
printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
kfree(journal);
|
||||
journal = NULL;
|
||||
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);
|
||||
if (!journal->j_wbuf) {
|
||||
printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
kfree(journal);
|
||||
return NULL;
|
||||
}
|
||||
|
@ -791,7 +791,7 @@ journal_t * journal_init_inode (struct inode *inode)
|
|||
/* If that failed, give up */
|
||||
if (err) {
|
||||
printk(KERN_ERR "%s: Cannnot locate journal superblock\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
kfree(journal);
|
||||
return NULL;
|
||||
}
|
||||
|
@ -877,7 +877,7 @@ int journal_create(journal_t *journal)
|
|||
*/
|
||||
printk(KERN_EMERG
|
||||
"%s: creation of journal on external device!\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
BUG();
|
||||
}
|
||||
|
||||
|
@ -1657,7 +1657,7 @@ static struct journal_head *journal_alloc_journal_head(void)
|
|||
jbd_debug(1, "out of memory for journal_head\n");
|
||||
if (time_after(jiffies, last_warning + 5*HZ)) {
|
||||
printk(KERN_NOTICE "ENOMEM in %s, retrying.\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
last_warning = jiffies;
|
||||
}
|
||||
while (ret == NULL) {
|
||||
|
@ -1794,13 +1794,13 @@ static void __journal_remove_journal_head(struct buffer_head *bh)
|
|||
if (jh->b_frozen_data) {
|
||||
printk(KERN_WARNING "%s: freeing "
|
||||
"b_frozen_data\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
jbd_free(jh->b_frozen_data, bh->b_size);
|
||||
}
|
||||
if (jh->b_committed_data) {
|
||||
printk(KERN_WARNING "%s: freeing "
|
||||
"b_committed_data\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
jbd_free(jh->b_committed_data, bh->b_size);
|
||||
}
|
||||
bh->b_private = NULL;
|
||||
|
|
|
@ -138,7 +138,7 @@ repeat:
|
|||
oom:
|
||||
if (!journal_oom_retry)
|
||||
return -ENOMEM;
|
||||
jbd_debug(1, "ENOMEM in %s, retrying\n", __FUNCTION__);
|
||||
jbd_debug(1, "ENOMEM in %s, retrying\n", __func__);
|
||||
yield();
|
||||
goto repeat;
|
||||
}
|
||||
|
|
|
@ -687,7 +687,7 @@ repeat:
|
|||
if (!frozen_buffer) {
|
||||
printk(KERN_EMERG
|
||||
"%s: OOM for frozen_buffer\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
JBUFFER_TRACE(jh, "oom!");
|
||||
error = -ENOMEM;
|
||||
jbd_lock_bh_state(bh);
|
||||
|
@ -904,7 +904,7 @@ repeat:
|
|||
committed_data = jbd_alloc(jh2bh(jh)->b_size, GFP_NOFS);
|
||||
if (!committed_data) {
|
||||
printk(KERN_EMERG "%s: No memory for committed data\n",
|
||||
__FUNCTION__);
|
||||
__func__);
|
||||
err = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue