diff options
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r-- | fs/ext4/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index aa0fb985b15e..bd1a391725c0 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -93,7 +93,7 @@ int ext4_forget(handle_t *handle, int is_metadata, struct inode *inode, | |||
93 | BUFFER_TRACE(bh, "call ext4_journal_revoke"); | 93 | BUFFER_TRACE(bh, "call ext4_journal_revoke"); |
94 | err = ext4_journal_revoke(handle, blocknr, bh); | 94 | err = ext4_journal_revoke(handle, blocknr, bh); |
95 | if (err) | 95 | if (err) |
96 | ext4_abort(inode->i_sb, __FUNCTION__, | 96 | ext4_abort(inode->i_sb, __func__, |
97 | "error %d when attempting revoke", err); | 97 | "error %d when attempting revoke", err); |
98 | BUFFER_TRACE(bh, "exit"); | 98 | BUFFER_TRACE(bh, "exit"); |
99 | return err; | 99 | return err; |
@@ -1240,7 +1240,7 @@ int ext4_journal_dirty_data(handle_t *handle, struct buffer_head *bh) | |||
1240 | { | 1240 | { |
1241 | int err = jbd2_journal_dirty_data(handle, bh); | 1241 | int err = jbd2_journal_dirty_data(handle, bh); |
1242 | if (err) | 1242 | if (err) |
1243 | ext4_journal_abort_handle(__FUNCTION__, __FUNCTION__, | 1243 | ext4_journal_abort_handle(__func__, __func__, |
1244 | bh, handle, err); | 1244 | bh, handle, err); |
1245 | return err; | 1245 | return err; |
1246 | } | 1246 | } |
@@ -3371,7 +3371,7 @@ int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode) | |||
3371 | EXT4_I(inode)->i_state |= EXT4_STATE_NO_EXPAND; | 3371 | EXT4_I(inode)->i_state |= EXT4_STATE_NO_EXPAND; |
3372 | if (mnt_count != | 3372 | if (mnt_count != |
3373 | le16_to_cpu(sbi->s_es->s_mnt_count)) { | 3373 | le16_to_cpu(sbi->s_es->s_mnt_count)) { |
3374 | ext4_warning(inode->i_sb, __FUNCTION__, | 3374 | ext4_warning(inode->i_sb, __func__, |
3375 | "Unable to expand inode %lu. Delete" | 3375 | "Unable to expand inode %lu. Delete" |
3376 | " some EAs or run e2fsck.", | 3376 | " some EAs or run e2fsck.", |
3377 | inode->i_ino); | 3377 | inode->i_ino); |
@@ -3412,7 +3412,7 @@ void ext4_dirty_inode(struct inode *inode) | |||
3412 | current_handle->h_transaction != handle->h_transaction) { | 3412 | current_handle->h_transaction != handle->h_transaction) { |
3413 | /* This task has a transaction open against a different fs */ | 3413 | /* This task has a transaction open against a different fs */ |
3414 | printk(KERN_EMERG "%s: transactions do not match!\n", | 3414 | printk(KERN_EMERG "%s: transactions do not match!\n", |
3415 | __FUNCTION__); | 3415 | __func__); |
3416 | } else { | 3416 | } else { |
3417 | jbd_debug(5, "marking dirty. outer handle=%p\n", | 3417 | jbd_debug(5, "marking dirty. outer handle=%p\n", |
3418 | current_handle); | 3418 | current_handle); |