nfs: replace remaining __FUNCTION__ occurrences
Subsystems (17)
A message that is not in the archive (sent off-list or not yet received): de3bbd22cbe7683747f9244f3dd3e433bee28842.1204595498.git.harvey.harrison@gmail.com
PATCH 2/13 ext3: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- fs/ext3/balloc.c | 12 ++++---- fs/ext3/ext3_jbd.c | 12 ++++---- fs/ext3/ialloc.c | 6 ++-- fs/ext3/inode.c | 6 ++-- fs/ext3/namei.c | 26 +++++++++--------- fs/ext3/resize.c | 70 ++++++++++++++++++++++++++-------------------------- fs/ext3/super.c | 14 +++++----- fs/ext3/xattr.c | 14 +++++----- 8 files changed, 80 insertions(+), 80 deletions(-)
fs/ext3/balloc.c +6 -6
@@ -117,7 +117,7 @@ static int ext3_valid_block_bitmap(struct super_block *sb,return 1 ; err_out: -ext3_error (sb, __FUNCTION__, +ext3_error (sb, __func__,"Invalid block bitmap - " "block_group = %d, block = %lu" , block_group, bitmap_blk);
@@ -147,7 +147,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group) bitmap_blk =le32_to_cpu (desc->bg_block_bitmap); bh =sb_getblk (sb, bitmap_blk);if (unlikely (!bh)) { -ext3_error (sb, __FUNCTION__, +ext3_error (sb, __func__,"Cannot read block bitmap - " "block_group = %d, block_bitmap = %u" , block_group,le32_to_cpu (desc->bg_block_bitmap));
@@ -158,7 +158,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)if (bh_submit_read (bh) <0 ) {brelse (bh); -ext3_error (sb, __FUNCTION__, +ext3_error (sb, __func__,"Cannot read block bitmap - " "block_group = %d, block_bitmap = %u" , block_group,le32_to_cpu (desc->bg_block_bitmap));
@@ -236,7 +236,7 @@ restart: BUG(); }#define rsv_window_dump (root, verbose) \ - __rsv_window_dump((root), (verbose), __FUNCTION__) + __rsv_window_dump((root), (verbose), __func__)#else #define rsv_window_dump (root, verbose) do {} while (0)#endif
@@ -618,7 +618,7 @@ do_more:if (!ext3_clear_bit_atomic (sb_bgl_lock (sbi, block_group), bit + i, bitmap_bh->b_data)) {jbd_unlock_bh_state (bitmap_bh); -ext3_error (sb, __FUNCTION__, +ext3_error (sb, __func__,"bit already cleared for block " E3FSBLK , block + i);jbd_lock_bh_state (bitmap_bh);
@@ -1668,7 +1668,7 @@ allocated:if (ext3_test_bit (grp_alloc_blk+i,bh2jh (bitmap_bh)->b_committed_data)) {printk ("%s: block was unexpectedly set in " -"b_committed_data\n" , __FUNCTION__); +"b_committed_data\n" , __func__); } } }
fs/ext3/ext3_jbd.c +6 -6
@@ -9,7 +9,7 @@ int __ext3_journal_get_undo_access(const char *where, handle_t *handle, {int err =journal_get_undo_access (handle, bh);if (err) -ext3_journal_abort_handle (where, __FUNCTION__, bh, handle,err); +ext3_journal_abort_handle (where, __func__, bh, handle,err);return err; }
@@ -18,7 +18,7 @@ int __ext3_journal_get_write_access(const char *where, handle_t *handle, {int err =journal_get_write_access (handle, bh);if (err) -ext3_journal_abort_handle (where, __FUNCTION__, bh, handle,err); +ext3_journal_abort_handle (where, __func__, bh, handle,err);return err; }
@@ -27,7 +27,7 @@ int __ext3_journal_forget(const char *where, handle_t *handle, {int err =journal_forget (handle, bh);if (err) -ext3_journal_abort_handle (where, __FUNCTION__, bh, handle,err); +ext3_journal_abort_handle (where, __func__, bh, handle,err);return err; }
@@ -36,7 +36,7 @@ int __ext3_journal_revoke(const char *where, handle_t *handle, {int err =journal_revoke (handle, blocknr, bh);if (err) -ext3_journal_abort_handle (where, __FUNCTION__, bh, handle,err); +ext3_journal_abort_handle (where, __func__, bh, handle,err);return err; }
@@ -45,7 +45,7 @@ int __ext3_journal_get_create_access(const char *where, {int err =journal_get_create_access (handle, bh);if (err) -ext3_journal_abort_handle (where, __FUNCTION__, bh, handle,err); +ext3_journal_abort_handle (where, __func__, bh, handle,err);return err; }
@@ -54,6 +54,6 @@ int __ext3_journal_dirty_metadata(const char *where, {int err =journal_dirty_metadata (handle, bh);if (err) -ext3_journal_abort_handle (where, __FUNCTION__, bh, handle,err); +ext3_journal_abort_handle (where, __func__, bh, handle,err);return err; }
fs/ext3/ialloc.c +3 -3
@@ -644,7 +644,7 @@ struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino)/* Error cases - e2fsck has already cleaned up for us */ if (ino > max_ino) { -ext3_warning (sb, __FUNCTION__, +ext3_warning (sb, __func__,"bad orphan ino %lu! e2fsck was run?" , ino); goto error; }
@@ -653,7 +653,7 @@ struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino) bit = (ino -1 ) %EXT3_INODES_PER_GROUP (sb); bitmap_bh =read_inode_bitmap (sb, block_group);if (!bitmap_bh) { -ext3_warning (sb, __FUNCTION__, +ext3_warning (sb, __func__,"inode bitmap error for orphan %lu" , ino); goto error; }
@@ -678,7 +678,7 @@ iget_failed: err =PTR_ERR (inode); inode =NULL ; bad_orphan: -ext3_warning (sb, __FUNCTION__, +ext3_warning (sb, __func__,"bad orphan inode %lu! e2fsck was run?" , ino); printk(KERN_NOTICE "ext3_test_bit(bit=%d, block=%llu) = %d\n", bit, (unsigned long long)bitmap_bh->b_blocknr,
fs/ext3/inode.c +3 -3
@@ -95,7 +95,7 @@ int ext3_forget(handle_t *handle, int is_metadata, struct inode *inode,BUFFER_TRACE (bh,"call ext3_journal_revoke" ); err =ext3_journal_revoke (handle, blocknr, bh);if (err) -ext3_abort (inode->i_sb, __FUNCTION__, +ext3_abort (inode->i_sb, __func__,"error %d when attempting revoke" , err);BUFFER_TRACE (bh,"exit" );return err;
@@ -1190,7 +1190,7 @@ int ext3_journal_dirty_data(handle_t *handle, struct buffer_head *bh) {int err =journal_dirty_data (handle, bh);if (err) -ext3_journal_abort_handle (__FUNCTION__, __FUNCTION__, +ext3_journal_abort_handle (__func__, __func__, bh, handle, err);return err; }
@@ -3214,7 +3214,7 @@ void ext3_dirty_inode(struct inode *inode) current_handle->h_transaction != handle->h_transaction) { /* This task has a transaction open against a different fs */ printk(KERN_EMERG "%s: transactions do not match!\n", - __FUNCTION__); + __func__); } else {jbd_debug (5 ,"marking dirty. outer handle=%p\n" , current_handle);
fs/ext3/namei.c +13 -13
@@ -356,7 +356,7 @@ dx_probe(struct dentry *dentry, struct inode *dir,if (root->info.hash_version !=DX_HASH_TEA && root->info.hash_version !=DX_HASH_HALF_MD4 && root->info.hash_version !=DX_HASH_LEGACY ) { -ext3_warning (dir->i_sb, __FUNCTION__, +ext3_warning (dir->i_sb, __func__,"Unrecognised inode hash code %d" , root->info.hash_version);brelse (bh);
@@ -370,7 +370,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, hash = hinfo->hash;if (root->info.unused_flags &1 ) { -ext3_warning (dir->i_sb, __FUNCTION__, +ext3_warning (dir->i_sb, __func__,"Unimplemented inode hash flags: %#06x" , root->info.unused_flags);brelse (bh);
@@ -379,7 +379,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, }if ((indirect = root->info.indirect_levels) >1 ) { -ext3_warning (dir->i_sb, __FUNCTION__, +ext3_warning (dir->i_sb, __func__,"Unimplemented inode hash depth: %#06x" , root->info.indirect_levels);brelse (bh);
@@ -392,7 +392,7 @@ dx_probe(struct dentry *dentry, struct inode *dir,if (dx_get_limit (entries) !=dx_root_limit (dir, root->info.info_length)) { -ext3_warning (dir->i_sb, __FUNCTION__, +ext3_warning (dir->i_sb, __func__,"dx entry: limit != root limit" );brelse (bh); *err =ERR_BAD_DX_DIR ;
@@ -404,7 +404,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, { count =dx_get_count (entries);if (!count || count >dx_get_limit (entries)) { -ext3_warning (dir->i_sb, __FUNCTION__, +ext3_warning (dir->i_sb, __func__,"dx entry: no count or count > limit" );brelse (bh); *err =ERR_BAD_DX_DIR ;
@@ -449,7 +449,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, goto fail2; at = entries = ((struct dx_node *) bh->b_data)->entries;if (dx_get_limit (entries) !=dx_node_limit (dir)) { -ext3_warning (dir->i_sb, __FUNCTION__, +ext3_warning (dir->i_sb, __func__,"dx entry: limit != node limit" );brelse (bh); *err =ERR_BAD_DX_DIR ;
@@ -465,7 +465,7 @@ fail2: } fail:if (*err ==ERR_BAD_DX_DIR ) -ext3_warning (dir->i_sb, __FUNCTION__, +ext3_warning (dir->i_sb, __func__,"Corrupt dir inode %ld, running e2fsck is " "recommended." , dir->i_ino);return NULL ;
@@ -913,7 +913,7 @@ restart:wait_on_buffer (bh);if (!buffer_uptodate (bh)) {/* read error, skip block & hope for the best */ -ext3_error (sb, __FUNCTION__,"reading directory #%lu " +ext3_error (sb, __func__,"reading directory #%lu " "offset %lu" , dir->i_ino, block);brelse (bh); goto next;
@@ -1005,7 +1005,7 @@ static struct buffer_head * ext3_dx_find_entry(struct dentry *dentry, retval =ext3_htree_next_block (dir, hash, frame, frames,NULL );if (retval <0 ) { -ext3_warning (sb, __FUNCTION__, +ext3_warning (sb, __func__,"error reading index page in directory #%lu" , dir->i_ino); *err = retval;
@@ -1530,7 +1530,7 @@ static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry,if (levels && (dx_get_count (frames->entries) ==dx_get_limit (frames->entries))) { -ext3_warning (sb, __FUNCTION__, +ext3_warning (sb, __func__,"Directory index full!" ); err = -ENOSPC ; goto cleanup;
@@ -1832,11 +1832,11 @@ static int empty_dir (struct inode * inode)if (inode->i_size <EXT3_DIR_REC_LEN (1 ) +EXT3_DIR_REC_LEN (2 ) || !(bh =ext3_bread (NULL , inode,0 ,0 , &err))) {if (err) -ext3_error (inode->i_sb, __FUNCTION__, +ext3_error (inode->i_sb, __func__,"error %d reading directory #%lu offset 0" , err, inode->i_ino);else -ext3_warning (inode->i_sb, __FUNCTION__, +ext3_warning (inode->i_sb, __func__,"bad directory (dir #%lu) - no data block" , inode->i_ino);return 1 ;
@@ -1865,7 +1865,7 @@ static int empty_dir (struct inode * inode) offset >> EXT3_BLOCK_SIZE_BITS(sb), 0, &err);if (!bh) {if (err) -ext3_error (sb, __FUNCTION__, +ext3_error (sb, __func__,"error %d reading directory" " #%lu offset %lu" , err, inode->i_ino, offset);
fs/ext3/resize.c +35 -35
238 lines not on this page · raw message
fs/ext3/super.c +7 -7
@@ -84,7 +84,7 @@ handle_t *ext3_journal_start_sb(struct super_block *sb, int nblocks)* take the FS itself readonly cleanly. */ journal =EXT3_SB (sb)->s_journal;if (is_journal_aborted (journal)) { -ext3_abort (sb, __FUNCTION__, +ext3_abort (sb, __func__,"Detected aborted journal" );return ERR_PTR (-EROFS ); }
@@ -304,7 +304,7 @@ void ext3_update_dynamic_rev(struct super_block *sb)if (le32_to_cpu (es->s_rev_level) >EXT3_GOOD_OLD_REV )return ; -ext3_warning (sb, __FUNCTION__, +ext3_warning (sb, __func__,"updating to rev %d because of new feature flag, " "running e2fsck is recommended" ,EXT3_DYNAMIC_REV );
@@ -1387,7 +1387,7 @@ static void ext3_orphan_cleanup (struct super_block * sb,if (inode->i_nlink) {printk (KERN_DEBUG "%s: truncating inode %lu to %Ld bytes\n" , - __FUNCTION__, inode->i_ino, inode->i_size); + __func__, inode->i_ino, inode->i_size);jbd_debug (2 ,"truncating inode %lu to %Ld bytes\n" , inode->i_ino, inode->i_size);ext3_truncate (inode);
@@ -1395,7 +1395,7 @@ static void ext3_orphan_cleanup (struct super_block * sb, }else {printk (KERN_DEBUG "%s: deleting unreferenced inode %lu\n" , - __FUNCTION__, inode->i_ino); + __func__, inode->i_ino);jbd_debug (2 ,"deleting unreferenced inode %lu\n" , inode->i_ino); nr_orphans++;
@@ -2298,9 +2298,9 @@ static void ext3_clear_journal_err(struct super_block * sb,char nbuf[16 ]; errstr =ext3_decode_error (sb, j_errno, nbuf); -ext3_warning (sb, __FUNCTION__,"Filesystem error recorded " +ext3_warning (sb, __func__,"Filesystem error recorded " "from previous mount: %s" , errstr); -ext3_warning (sb, __FUNCTION__,"Marking fs in need of " +ext3_warning (sb, __func__,"Marking fs in need of " "filesystem check." );EXT3_SB (sb)->s_mount_state |=EXT3_ERROR_FS ;
@@ -2427,7 +2427,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) }if (sbi->s_mount_opt &EXT3_MOUNT_ABORT ) -ext3_abort (sb, __FUNCTION__,"Abort forced by user" ); +ext3_abort (sb, __func__,"Abort forced by user" ); sb->s_flags = (sb->s_flags & ~MS_POSIXACL ) | ((sbi->s_mount_opt &EXT3_MOUNT_POSIX_ACL ) ?MS_POSIXACL :0 );
fs/ext3/xattr.c +7 -7
@@ -232,7 +232,7 @@ ext3_xattr_block_get(struct inode *inode, int name_index, const char *name,ea_bdebug (bh,"b_count=%d, refcount=%d" ,atomic_read (&(bh->b_count)),le32_to_cpu (BHDR (bh)->h_refcount));if (ext3_xattr_check_block (bh)) { -bad_block:ext3_error (inode->i_sb, __FUNCTION__, +bad_block:ext3_error (inode->i_sb, __func__,"inode %lu: bad block " E3FSBLK , inode->i_ino,EXT3_I (inode)->i_file_acl); error = -EIO ;
@@ -374,7 +374,7 @@ ext3_xattr_block_list(struct inode *inode, char *buffer, size_t buffer_size)ea_bdebug (bh,"b_count=%d, refcount=%d" ,atomic_read (&(bh->b_count)),le32_to_cpu (BHDR (bh)->h_refcount));if (ext3_xattr_check_block (bh)) { -ext3_error (inode->i_sb, __FUNCTION__, +ext3_error (inode->i_sb, __func__,"inode %lu: bad block " E3FSBLK , inode->i_ino,EXT3_I (inode)->i_file_acl); error = -EIO ;
@@ -649,7 +649,7 @@ ext3_xattr_block_find(struct inode *inode, struct ext3_xattr_info *i,atomic_read (&(bs->bh->b_count)), le32_to_cpu(BHDR(bs->bh)->h_refcount));if (ext3_xattr_check_block (bs->bh)) { -ext3_error (sb, __FUNCTION__, +ext3_error (sb, __func__,"inode %lu: bad block " E3FSBLK , inode->i_ino,EXT3_I (inode)->i_file_acl); error = -EIO ;
@@ -852,7 +852,7 @@ cleanup_dquot: goto cleanup; bad_block: -ext3_error (inode->i_sb, __FUNCTION__, +ext3_error (inode->i_sb, __func__,"inode %lu: bad block " E3FSBLK , inode->i_ino,EXT3_I (inode)->i_file_acl); goto cleanup;
@@ -1081,14 +1081,14 @@ ext3_xattr_delete_inode(handle_t *handle, struct inode *inode) goto cleanup; bh =sb_bread (inode->i_sb,EXT3_I (inode)->i_file_acl);if (!bh) { -ext3_error (inode->i_sb, __FUNCTION__, +ext3_error (inode->i_sb, __func__,"inode %lu: block " E3FSBLK " read error" , inode->i_ino,EXT3_I (inode)->i_file_acl); goto cleanup; }if (BHDR (bh)->h_magic !=cpu_to_le32 (EXT3_XATTR_MAGIC ) ||BHDR (bh)->h_blocks !=cpu_to_le32 (1 )) { -ext3_error (inode->i_sb, __FUNCTION__, +ext3_error (inode->i_sb, __func__,"inode %lu: bad block " E3FSBLK , inode->i_ino,EXT3_I (inode)->i_file_acl); goto cleanup;
@@ -1215,7 +1215,7 @@ again: } bh =sb_bread (inode->i_sb, ce->e_block);if (!bh) { -ext3_error (inode->i_sb, __FUNCTION__, +ext3_error (inode->i_sb, __func__,"inode %lu: block %lu read error" , inode->i_ino, (unsigned long ) ce->e_block); } else if (le32_to_cpu(BHDR(bh)->h_refcount) >=
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 3/13 ext4: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- fs/ext4/balloc.c | 14 +++++----- fs/ext4/ext4_jbd2.c | 12 ++++---- fs/ext4/extents.c | 2 +- fs/ext4/ialloc.c | 10 +++--- fs/ext4/inode.c | 8 +++--- fs/ext4/mballoc.c | 20 +++++++------- fs/ext4/namei.c | 26 +++++++++--------- fs/ext4/resize.c | 70 +++++++++++++++++++++++++------------------------- fs/ext4/super.c | 16 ++++++------ fs/ext4/xattr.c | 16 ++++++------ 10 files changed, 97 insertions(+), 97 deletions(-)
fs/ext4/balloc.c +7 -7
@@ -59,7 +59,7 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh,/* If checksum is bad mark all blocks used to prevent allocation * essentially implementing a per-group read-only flag. */ if (!ext4_group_desc_csum_verify (sbi, block_group, gdp)) { -ext4_error (sb, __FUNCTION__, +ext4_error (sb, __func__,"Checksum bad for group %lu\n" , block_group); gdp->bg_free_blocks_count =0 ; gdp->bg_free_inodes_count =0 ;
@@ -235,7 +235,7 @@ static int ext4_valid_block_bitmap(struct super_block *sb,return 1 ; err_out: -ext4_error (sb, __FUNCTION__, +ext4_error (sb, __func__,"Invalid block bitmap - " "block_group = %d, block = %llu" , block_group, bitmap_blk);
@@ -264,7 +264,7 @@ read_block_bitmap(struct super_block *sb, ext4_group_t block_group) bitmap_blk =ext4_block_bitmap (sb, desc); bh =sb_getblk (sb, bitmap_blk);if (unlikely (!bh)) { -ext4_error (sb, __FUNCTION__, +ext4_error (sb, __func__,"Cannot read block bitmap - " "block_group = %d, block_bitmap = %llu" , (int )block_group, (unsigned long long )bitmap_blk);
@@ -281,7 +281,7 @@ read_block_bitmap(struct super_block *sb, ext4_group_t block_group) }if (bh_submit_read (bh) <0 ) {put_bh (bh); -ext4_error (sb, __FUNCTION__, +ext4_error (sb, __func__,"Cannot read block bitmap - " "block_group = %d, block_bitmap = %llu" , (int )block_group, (unsigned long long )bitmap_blk);
@@ -360,7 +360,7 @@ restart: BUG(); }#define rsv_window_dump (root, verbose) \ - __rsv_window_dump((root), (verbose), __FUNCTION__) + __rsv_window_dump((root), (verbose), __func__)#else #define rsv_window_dump (root, verbose) do {} while (0)#endif
@@ -740,7 +740,7 @@ do_more:if (!ext4_clear_bit_atomic (sb_bgl_lock (sbi, block_group), bit + i, bitmap_bh->b_data)) {jbd_unlock_bh_state (bitmap_bh); -ext4_error (sb, __FUNCTION__, +ext4_error (sb, __func__,"bit already cleared for block %llu" , (ext4_fsblk_t)(block + i));jbd_lock_bh_state (bitmap_bh);
@@ -1798,7 +1798,7 @@ allocated:if (ext4_test_bit (grp_alloc_blk+i,bh2jh (bitmap_bh)->b_committed_data)) {printk ("%s: block was unexpectedly set in " -"b_committed_data\n" , __FUNCTION__); +"b_committed_data\n" , __func__); } } }
fs/ext4/ext4_jbd2.c +6 -6
@@ -9,7 +9,7 @@ int __ext4_journal_get_undo_access(const char *where, handle_t *handle, {int err =jbd2_journal_get_undo_access (handle, bh);if (err) -ext4_journal_abort_handle (where, __FUNCTION__, bh, handle,err); +ext4_journal_abort_handle (where, __func__, bh, handle,err);return err; }
@@ -18,7 +18,7 @@ int __ext4_journal_get_write_access(const char *where, handle_t *handle, {int err =jbd2_journal_get_write_access (handle, bh);if (err) -ext4_journal_abort_handle (where, __FUNCTION__, bh, handle,err); +ext4_journal_abort_handle (where, __func__, bh, handle,err);return err; }
@@ -27,7 +27,7 @@ int __ext4_journal_forget(const char *where, handle_t *handle, {int err =jbd2_journal_forget (handle, bh);if (err) -ext4_journal_abort_handle (where, __FUNCTION__, bh, handle,err); +ext4_journal_abort_handle (where, __func__, bh, handle,err);return err; }
@@ -36,7 +36,7 @@ int __ext4_journal_revoke(const char *where, handle_t *handle, {int err =jbd2_journal_revoke (handle, blocknr, bh);if (err) -ext4_journal_abort_handle (where, __FUNCTION__, bh, handle,err); +ext4_journal_abort_handle (where, __func__, bh, handle,err);return err; }
@@ -45,7 +45,7 @@ int __ext4_journal_get_create_access(const char *where, {int err =jbd2_journal_get_create_access (handle, bh);if (err) -ext4_journal_abort_handle (where, __FUNCTION__, bh, handle,err); +ext4_journal_abort_handle (where, __func__, bh, handle,err);return err; }
@@ -54,6 +54,6 @@ int __ext4_journal_dirty_metadata(const char *where, {int err =jbd2_journal_dirty_metadata (handle, bh);if (err) -ext4_journal_abort_handle (where, __FUNCTION__, bh, handle,err); +ext4_journal_abort_handle (where, __func__, bh, handle,err);return err; }
fs/ext4/extents.c +1 -1
@@ -308,7 +308,7 @@ corrupted: }#define ext4_ext_check_header (inode, eh, depth) \ - __ext4_ext_check_header(__FUNCTION__, inode, eh, depth) + __ext4_ext_check_header(__func__, inode, eh, depth)#ifdef EXT_DEBUG static void ext4_ext_show_path (struct inode *inode,struct ext4_ext_path *path)
fs/ext4/ialloc.c +5 -5
@@ -75,7 +75,7 @@ unsigned ext4_init_inode_bitmap(struct super_block *sb, struct buffer_head *bh,/* If checksum is bad mark all blocks and inodes use to prevent * allocation, essentially implementing a per-group read-only flag. */ if (!ext4_group_desc_csum_verify (sbi, block_group, gdp)) { -ext4_error (sb, __FUNCTION__,"Checksum bad for group %lu\n" , +ext4_error (sb, __func__,"Checksum bad for group %lu\n" , block_group); gdp->bg_free_blocks_count =0 ; gdp->bg_free_inodes_count =0 ;
@@ -588,7 +588,7 @@ got: ino++;if ((group ==0 && ino <EXT4_FIRST_INO (sb)) || ino >EXT4_INODES_PER_GROUP (sb)) { -ext4_error (sb, __FUNCTION__, +ext4_error (sb, __func__,"reserved inode or inode > inodes count - " "block_group = %lu, inode=%lu" , group, ino + group *EXT4_INODES_PER_GROUP (sb));
@@ -796,7 +796,7 @@ struct inode *ext4_orphan_get(struct super_block *sb, unsigned long ino)/* Error cases - e2fsck has already cleaned up for us */ if (ino > max_ino) { -ext4_warning (sb, __FUNCTION__, +ext4_warning (sb, __func__,"bad orphan ino %lu! e2fsck was run?" , ino); goto error; }
@@ -805,7 +805,7 @@ struct inode *ext4_orphan_get(struct super_block *sb, unsigned long ino) bit = (ino -1 ) %EXT4_INODES_PER_GROUP (sb); bitmap_bh =read_inode_bitmap (sb, block_group);if (!bitmap_bh) { -ext4_warning (sb, __FUNCTION__, +ext4_warning (sb, __func__,"inode bitmap error for orphan %lu" , ino); goto error; }
@@ -830,7 +830,7 @@ iget_failed: err =PTR_ERR (inode); inode =NULL ; bad_orphan: -ext4_warning (sb, __FUNCTION__, +ext4_warning (sb, __func__,"bad orphan inode %lu! e2fsck was run?" , ino); printk(KERN_NOTICE "ext4_test_bit(bit=%d, block=%llu) = %d\n", bit, (unsigned long long)bitmap_bh->b_blocknr,
fs/ext4/inode.c +4 -4
@@ -93,7 +93,7 @@ int ext4_forget(handle_t *handle, int is_metadata, struct inode *inode,BUFFER_TRACE (bh,"call ext4_journal_revoke" ); err =ext4_journal_revoke (handle, blocknr, bh);if (err) -ext4_abort (inode->i_sb, __FUNCTION__, +ext4_abort (inode->i_sb, __func__,"error %d when attempting revoke" , err);BUFFER_TRACE (bh,"exit" );return err;
@@ -1230,7 +1230,7 @@ int ext4_journal_dirty_data(handle_t *handle, struct buffer_head *bh) {int err =jbd2_journal_dirty_data (handle, bh);if (err) -ext4_journal_abort_handle (__FUNCTION__, __FUNCTION__, +ext4_journal_abort_handle (__func__, __func__, bh, handle, err);return err; }
@@ -3374,7 +3374,7 @@ int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode)EXT4_I (inode)->i_state |=EXT4_STATE_NO_EXPAND ;if (mnt_count !=le16_to_cpu (sbi->s_es->s_mnt_count)) { -ext4_warning (inode->i_sb, __FUNCTION__, +ext4_warning (inode->i_sb, __func__,"Unable to expand inode %lu. Delete" " some EAs or run e2fsck." , inode->i_ino);
@@ -3415,7 +3415,7 @@ void ext4_dirty_inode(struct inode *inode) current_handle->h_transaction != handle->h_transaction) { /* This task has a transaction open against a different fs */ printk(KERN_EMERG "%s: transactions do not match!\n", - __FUNCTION__); + __func__); } else {jbd_debug (5 ,"marking dirty. outer handle=%p\n" , current_handle);
fs/ext4/mballoc.c +10 -10
@@ -736,7 +736,7 @@ static void mb_free_blocks_double(struct inode *inode, struct ext4_buddy *e4b, blocknr +=le32_to_cpu (EXT4_SB (sb)->s_es->s_first_data_block); -ext4_error (sb, __FUNCTION__,"double-free of inode" +ext4_error (sb, __func__,"double-free of inode" " %lu's block %llu(bit %u in group %lu)\n" , inode ? inode->i_ino :0 , blocknr, first + i, e4b->bd_group);
@@ -908,7 +908,7 @@ static int __mb_check_buddy(struct ext4_buddy *e4b, char *file, }#undef MB_CHECK_ASSERT#define mb_check_buddy (e4b) __mb_check_buddy(e4b, \ - __FILE__, __FUNCTION__, __LINE__) + __FILE__, __func__, __LINE__)#else #define mb_check_buddy (e4b)#endif
@@ -982,7 +982,7 @@ static void ext4_mb_generate_buddy(struct super_block *sb, grp->bb_fragments = fragments;if (free != grp->bb_free) { -ext4_error (sb, __FUNCTION__, +ext4_error (sb, __func__,"EXT4-fs: group %lu: %u blocks in bitmap, %u in gd\n" , group, free, grp->bb_free);/*
@@ -1367,7 +1367,7 @@ static int mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b, blocknr +=le32_to_cpu (EXT4_SB (sb)->s_es->s_first_data_block); -ext4_error (sb, __FUNCTION__,"double-free of inode" +ext4_error (sb, __func__,"double-free of inode" " %lu's block %llu(bit %u in group %lu)\n" , inode ? inode->i_ino :0 , blocknr, block, e4b->bd_group);
@@ -1848,7 +1848,7 @@ static void ext4_mb_complex_scan_group(struct ext4_allocation_context *ac,* free blocks even though group info says we * we have free blocks */ -ext4_error (sb, __FUNCTION__,"%d free blocks as per " +ext4_error (sb, __func__,"%d free blocks as per " "group info. But bitmap says 0\n" , free);break ;
@@ -1857,7 +1857,7 @@ static void ext4_mb_complex_scan_group(struct ext4_allocation_context *ac,mb_find_extent (e4b,0 , i, ac->ac_g_ex.fe_len, &ex);BUG_ON (ex.fe_len <=0 );if (free < ex.fe_len) { -ext4_error (sb, __FUNCTION__,"%d free blocks as per " +ext4_error (sb, __func__,"%d free blocks as per " "group info. But got %d blocks\n" , free, ex.fe_len);/*
@@ -3078,7 +3078,7 @@ static int ext4_mb_mark_diskspace_used(struct ext4_allocation_context *ac, in_range(block, ext4_inode_table(sb, gdp), EXT4_SB(sb)->s_itb_per_group)) { -ext4_error (sb, __FUNCTION__, +ext4_error (sb, __func__,"Allocating block in system zone - block = %llu" , block); }
@@ -3797,7 +3797,7 @@ static int ext4_mb_release_inode_pa(struct ext4_buddy *e4b, pa, (unsigned long ) pa->pa_lstart, (unsigned long ) pa->pa_pstart, (unsigned long) pa->pa_len); -ext4_error (sb, __FUNCTION__,"free %u, pa_free %u\n" , +ext4_error (sb, __func__,"free %u, pa_free %u\n" , free, pa->pa_free);/* * pa is already deleted so we use the value obtained
@@ -4497,7 +4497,7 @@ void ext4_mb_free_blocks(handle_t *handle, struct inode *inode,if (block <le32_to_cpu (es->s_first_data_block) || block + count < block || block + count >ext4_blocks_count (es)) { -ext4_error (sb, __FUNCTION__, +ext4_error (sb, __func__,"Freeing blocks not in datazone - " "block = %lu, count = %lu" , block, count); goto error_return;
@@ -4538,7 +4538,7 @@ do_more: in_range(block + count - 1, ext4_inode_table(sb, gdp), EXT4_SB(sb)->s_itb_per_group)) { -ext4_error (sb, __FUNCTION__, +ext4_error (sb, __func__,"Freeing blocks in system zone - " "Block = %lu, count = %lu" , block, count); }
fs/ext4/namei.c +13 -13
@@ -348,7 +348,7 @@ dx_probe(struct dentry *dentry, struct inode *dir,if (root->info.hash_version !=DX_HASH_TEA && root->info.hash_version !=DX_HASH_HALF_MD4 && root->info.hash_version !=DX_HASH_LEGACY ) { -ext4_warning (dir->i_sb, __FUNCTION__, +ext4_warning (dir->i_sb, __func__,"Unrecognised inode hash code %d" , root->info.hash_version);brelse (bh);
@@ -362,7 +362,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, hash = hinfo->hash;if (root->info.unused_flags &1 ) { -ext4_warning (dir->i_sb, __FUNCTION__, +ext4_warning (dir->i_sb, __func__,"Unimplemented inode hash flags: %#06x" , root->info.unused_flags);brelse (bh);
@@ -371,7 +371,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, }if ((indirect = root->info.indirect_levels) >1 ) { -ext4_warning (dir->i_sb, __FUNCTION__, +ext4_warning (dir->i_sb, __func__,"Unimplemented inode hash depth: %#06x" , root->info.indirect_levels);brelse (bh);
@@ -384,7 +384,7 @@ dx_probe(struct dentry *dentry, struct inode *dir,if (dx_get_limit (entries) !=dx_root_limit (dir, root->info.info_length)) { -ext4_warning (dir->i_sb, __FUNCTION__, +ext4_warning (dir->i_sb, __func__,"dx entry: limit != root limit" );brelse (bh); *err =ERR_BAD_DX_DIR ;
@@ -396,7 +396,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, { count =dx_get_count (entries);if (!count || count >dx_get_limit (entries)) { -ext4_warning (dir->i_sb, __FUNCTION__, +ext4_warning (dir->i_sb, __func__,"dx entry: no count or count > limit" );brelse (bh); *err =ERR_BAD_DX_DIR ;
@@ -441,7 +441,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, goto fail2; at = entries = ((struct dx_node *) bh->b_data)->entries;if (dx_get_limit (entries) !=dx_node_limit (dir)) { -ext4_warning (dir->i_sb, __FUNCTION__, +ext4_warning (dir->i_sb, __func__,"dx entry: limit != node limit" );brelse (bh); *err =ERR_BAD_DX_DIR ;
@@ -457,7 +457,7 @@ fail2: } fail:if (*err ==ERR_BAD_DX_DIR ) -ext4_warning (dir->i_sb, __FUNCTION__, +ext4_warning (dir->i_sb, __func__,"Corrupt dir inode %ld, running e2fsck is " "recommended." , dir->i_ino);return NULL ;
@@ -914,7 +914,7 @@ restart:wait_on_buffer (bh);if (!buffer_uptodate (bh)) {/* read error, skip block & hope for the best */ -ext4_error (sb, __FUNCTION__,"reading directory #%lu " +ext4_error (sb, __func__,"reading directory #%lu " "offset %lu" , dir->i_ino, (unsigned long )block);brelse (bh);
@@ -1007,7 +1007,7 @@ static struct buffer_head * ext4_dx_find_entry(struct dentry *dentry, retval =ext4_htree_next_block (dir, hash, frame, frames,NULL );if (retval <0 ) { -ext4_warning (sb, __FUNCTION__, +ext4_warning (sb, __func__,"error reading index page in directory #%lu" , dir->i_ino); *err = retval;
@@ -1532,7 +1532,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry,if (levels && (dx_get_count (frames->entries) ==dx_get_limit (frames->entries))) { -ext4_warning (sb, __FUNCTION__, +ext4_warning (sb, __func__,"Directory index full!" ); err = -ENOSPC ; goto cleanup;
@@ -1860,11 +1860,11 @@ static int empty_dir (struct inode * inode)if (inode->i_size <EXT4_DIR_REC_LEN (1 ) +EXT4_DIR_REC_LEN (2 ) || !(bh =ext4_bread (NULL , inode,0 ,0 , &err))) {if (err) -ext4_error (inode->i_sb, __FUNCTION__, +ext4_error (inode->i_sb, __func__,"error %d reading directory #%lu offset 0" , err, inode->i_ino);else -ext4_warning (inode->i_sb, __FUNCTION__, +ext4_warning (inode->i_sb, __func__,"bad directory (dir #%lu) - no data block" , inode->i_ino);return 1 ;
@@ -1893,7 +1893,7 @@ static int empty_dir (struct inode * inode) offset >> EXT4_BLOCK_SIZE_BITS(sb), 0, &err);if (!bh) {if (err) -ext4_error (sb, __FUNCTION__, +ext4_error (sb, __func__,"error %d reading directory" " #%lu offset %lu" , err, inode->i_ino, offset);
fs/ext4/resize.c +35 -35
241 lines not on this page · raw message
fs/ext4/super.c +8 -8
@@ -135,7 +135,7 @@ handle_t *ext4_journal_start_sb(struct super_block *sb, int nblocks)* take the FS itself readonly cleanly. */ journal =EXT4_SB (sb)->s_journal;if (is_journal_aborted (journal)) { -ext4_abort (sb, __FUNCTION__, +ext4_abort (sb, __func__,"Detected aborted journal" );return ERR_PTR (-EROFS ); }
@@ -355,7 +355,7 @@ void ext4_update_dynamic_rev(struct super_block *sb)if (le32_to_cpu (es->s_rev_level) >EXT4_GOOD_OLD_REV )return ; -ext4_warning (sb, __FUNCTION__, +ext4_warning (sb, __func__,"updating to rev %d because of new feature flag, " "running e2fsck is recommended" ,EXT4_DYNAMIC_REV );
@@ -1510,7 +1510,7 @@ static int ext4_check_descriptors(struct super_block *sb)return 0 ; }if (!ext4_group_desc_csum_verify (sbi, i, gdp)) { -ext4_error (sb, __FUNCTION__, +ext4_error (sb, __func__,"Checksum for group %lu failed (%u!=%u)\n" , i,le16_to_cpu (ext4_group_desc_csum (sbi, i, gdp)),le16_to_cpu (gdp->bg_checksum));
@@ -1604,7 +1604,7 @@ static void ext4_orphan_cleanup (struct super_block * sb,if (inode->i_nlink) {printk (KERN_DEBUG "%s: truncating inode %lu to %Ld bytes\n" , - __FUNCTION__, inode->i_ino, inode->i_size); + __func__, inode->i_ino, inode->i_size);jbd_debug (2 ,"truncating inode %lu to %Ld bytes\n" , inode->i_ino, inode->i_size);ext4_truncate (inode);
@@ -1612,7 +1612,7 @@ static void ext4_orphan_cleanup (struct super_block * sb, }else {printk (KERN_DEBUG "%s: deleting unreferenced inode %lu\n" , - __FUNCTION__, inode->i_ino); + __func__, inode->i_ino);jbd_debug (2 ,"deleting unreferenced inode %lu\n" , inode->i_ino); nr_orphans++;
@@ -2698,9 +2698,9 @@ static void ext4_clear_journal_err(struct super_block * sb,char nbuf[16 ]; errstr =ext4_decode_error (sb, j_errno, nbuf); -ext4_warning (sb, __FUNCTION__,"Filesystem error recorded " +ext4_warning (sb, __func__,"Filesystem error recorded " "from previous mount: %s" , errstr); -ext4_warning (sb, __FUNCTION__,"Marking fs in need of " +ext4_warning (sb, __func__,"Marking fs in need of " "filesystem check." );EXT4_SB (sb)->s_mount_state |=EXT4_ERROR_FS ;
@@ -2827,7 +2827,7 @@ static int ext4_remount (struct super_block * sb, int * flags, char * data) }if (sbi->s_mount_opt &EXT4_MOUNT_ABORT ) -ext4_abort (sb, __FUNCTION__,"Abort forced by user" ); +ext4_abort (sb, __func__,"Abort forced by user" ); sb->s_flags = (sb->s_flags & ~MS_POSIXACL ) | ((sbi->s_mount_opt &EXT4_MOUNT_POSIX_ACL ) ?MS_POSIXACL :0 );
fs/ext4/xattr.c +8 -8
@@ -225,7 +225,7 @@ ext4_xattr_block_get(struct inode *inode, int name_index, const char *name,ea_bdebug (bh,"b_count=%d, refcount=%d" ,atomic_read (&(bh->b_count)),le32_to_cpu (BHDR (bh)->h_refcount));if (ext4_xattr_check_block (bh)) { -bad_block:ext4_error (inode->i_sb, __FUNCTION__, +bad_block:ext4_error (inode->i_sb, __func__,"inode %lu: bad block %llu" , inode->i_ino,EXT4_I (inode)->i_file_acl); error = -EIO ;
@@ -367,7 +367,7 @@ ext4_xattr_block_list(struct inode *inode, char *buffer, size_t buffer_size)ea_bdebug (bh,"b_count=%d, refcount=%d" ,atomic_read (&(bh->b_count)),le32_to_cpu (BHDR (bh)->h_refcount));if (ext4_xattr_check_block (bh)) { -ext4_error (inode->i_sb, __FUNCTION__, +ext4_error (inode->i_sb, __func__,"inode %lu: bad block %llu" , inode->i_ino,EXT4_I (inode)->i_file_acl); error = -EIO ;
@@ -660,7 +660,7 @@ ext4_xattr_block_find(struct inode *inode, struct ext4_xattr_info *i,atomic_read (&(bs->bh->b_count)), le32_to_cpu(BHDR(bs->bh)->h_refcount));if (ext4_xattr_check_block (bs->bh)) { -ext4_error (sb, __FUNCTION__, +ext4_error (sb, __func__,"inode %lu: bad block %llu" , inode->i_ino,EXT4_I (inode)->i_file_acl); error = -EIO ;
@@ -863,7 +863,7 @@ cleanup_dquot: goto cleanup; bad_block: -ext4_error (inode->i_sb, __FUNCTION__, +ext4_error (inode->i_sb, __func__,"inode %lu: bad block %llu" , inode->i_ino,EXT4_I (inode)->i_file_acl); goto cleanup;
@@ -1166,7 +1166,7 @@ retry:if (!bh) goto cleanup;if (ext4_xattr_check_block (bh)) { -ext4_error (inode->i_sb, __FUNCTION__, +ext4_error (inode->i_sb, __func__,"inode %lu: bad block %llu" , inode->i_ino,EXT4_I (inode)->i_file_acl); error = -EIO ;
@@ -1341,14 +1341,14 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode) goto cleanup; bh =sb_bread (inode->i_sb,EXT4_I (inode)->i_file_acl);if (!bh) { -ext4_error (inode->i_sb, __FUNCTION__, +ext4_error (inode->i_sb, __func__,"inode %lu: block %llu read error" , inode->i_ino,EXT4_I (inode)->i_file_acl); goto cleanup; }if (BHDR (bh)->h_magic !=cpu_to_le32 (EXT4_XATTR_MAGIC ) ||BHDR (bh)->h_blocks !=cpu_to_le32 (1 )) { -ext4_error (inode->i_sb, __FUNCTION__, +ext4_error (inode->i_sb, __func__,"inode %lu: bad block %llu" , inode->i_ino,EXT4_I (inode)->i_file_acl); goto cleanup;
@@ -1475,7 +1475,7 @@ again: } bh =sb_bread (inode->i_sb, ce->e_block);if (!bh) { -ext4_error (inode->i_sb, __FUNCTION__, +ext4_error (inode->i_sb, __func__,"inode %lu: block %lu read error" , inode->i_ino, (unsigned long ) ce->e_block); } else if (le32_to_cpu(BHDR(bh)->h_refcount) >=
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 4/13 nfs: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- fs/nfs/callback.c | 4 +- fs/nfs/callback_proc.c | 4 +- fs/nfs/callback_xdr.c | 18 ++++---- fs/nfs/client.c | 8 ++-- fs/nfs/delegation.c | 4 +- fs/nfs/dir.c | 18 ++++---- fs/nfs/file.c | 2 +- fs/nfs/inode.c | 4 +- fs/nfs/namespace.c | 8 ++-- fs/nfs/nfs3proc.c | 6 +- fs/nfs/nfs4namespace.c | 12 +++--- fs/nfs/nfs4proc.c | 32 +++++++------- fs/nfs/nfs4renewd.c | 10 ++-- fs/nfs/nfs4state.c | 6 +- fs/nfs/nfs4xdr.c | 106 ++++++++++++++++++++++++------------------------ fs/nfs/proc.c | 8 ++-- fs/nfs/read.c | 2 +- fs/nfs/super.c | 2 +- 18 files changed, 127 insertions(+), 127 deletions(-)
fs/nfs/callback.c +2 -2
@@ -87,7 +87,7 @@ static void nfs_callback_svc(struct svc_rqst *rqstp)if (err <0 ) {printk (KERN_WARNING "%s: terminating on error %d\n" , - __FUNCTION__, -err); + __func__, -err);break ; }svc_process (rqstp);
@@ -179,7 +179,7 @@ static int nfs_callback_authenticate(struct svc_rqst *rqstp)if (clp ==NULL )return SVC_DROP ; -dprintk ("%s: %s NFSv4 callback!\n" , __FUNCTION__, +dprintk ("%s: %s NFSv4 callback!\n" , __func__,svc_print_addr (rqstp, buf,sizeof (buf)));nfs_put_client (clp);
fs/nfs/callback_proc.c +2 -2
@@ -57,7 +57,7 @@ out_iput: out_putclient:nfs_put_client (clp); out: -dprintk ("%s: exit with status = %d\n" , __FUNCTION__,ntohl (res->status)); +dprintk ("%s: exit with status = %d\n" , __func__,ntohl (res->status));return res->status; }
@@ -98,6 +98,6 @@ __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy)nfs_put_client (prev); }while (clp !=NULL ); out: -dprintk ("%s: exit with status = %d\n" , __FUNCTION__,ntohl (res)); +dprintk ("%s: exit with status = %d\n" , __func__,ntohl (res));return res; }
fs/nfs/callback_xdr.c +9 -9
@@ -141,7 +141,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound/* We do not like overly long tags! */ if (hdr->taglen >CB_OP_TAGLEN_MAXSZ -12 ) {printk ("NFSv4 CALLBACK %s: client sent tag of length %u\n" , - __FUNCTION__, hdr->taglen); + __func__, hdr->taglen);return htonl (NFS4ERR_RESOURCE ); } p =read_buf (xdr,12 );
@@ -151,7 +151,7 @@ static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound/* Check minor version is zero. */ if (minor_version !=0 ) {printk (KERN_WARNING "%s: NFSv4 server callback with illegal minor version %u!\n" , - __FUNCTION__, minor_version); + __func__, minor_version);return htonl (NFS4ERR_MINOR_VERS_MISMATCH ); } hdr->callback_ident =ntohl (*p++);
@@ -179,7 +179,7 @@ static __be32 decode_getattr_args(struct svc_rqst *rqstp, struct xdr_stream *xdr args->addr =svc_addr (rqstp); status =decode_bitmap (xdr, args->bitmap); out: -dprintk ("%s: exit with status = %d\n" , __FUNCTION__,ntohl (status)); +dprintk ("%s: exit with status = %d\n" , __func__,ntohl (status));return status; }
@@ -200,7 +200,7 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, args->truncate =ntohl (*p); status =decode_fh (xdr, &args->fh); out: -dprintk ("%s: exit with status = %d\n" , __FUNCTION__,ntohl (status)); +dprintk ("%s: exit with status = %d\n" , __func__,ntohl (status));return status; }
@@ -349,7 +349,7 @@ static __be32 encode_getattr_res(struct svc_rqst *rqstp, struct xdr_stream *xdr, status =encode_attr_mtime (xdr, res->bitmap, &res->mtime); *savep =htonl ((unsigned int )((char *)xdr->p - (char *)(savep+1 ))); out: -dprintk ("%s: exit with status = %d\n" , __FUNCTION__,ntohl (status)); +dprintk ("%s: exit with status = %d\n" , __func__,ntohl (status));return status; }
@@ -363,7 +363,7 @@ static __be32 process_op(struct svc_rqst *rqstp,long maxlen;__be32 res; -dprintk ("%s: start\n" , __FUNCTION__); +dprintk ("%s: start\n" , __func__); status =decode_op_hdr (xdr_in, &op_nr);if (likely (status ==0 )) {switch (op_nr) {
@@ -392,7 +392,7 @@ static __be32 process_op(struct svc_rqst *rqstp, status = res;if (op->encode_res !=NULL && status ==0 ) status = op->encode_res (rqstp, xdr_out, resp); -dprintk ("%s: done, status = %d\n" , __FUNCTION__,ntohl (status)); +dprintk ("%s: done, status = %d\n" , __func__,ntohl (status));return status; }
@@ -408,7 +408,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r__be32 status;unsigned int nops =1 ; -dprintk ("%s: start\n" , __FUNCTION__); +dprintk ("%s: start\n" , __func__);xdr_init_decode (&xdr_in, &rqstp->rq_arg, rqstp->rq_arg.head[0 ].iov_base);
@@ -431,7 +431,7 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp, void *argp, void *r } *hdr_res.status = status; *hdr_res.nops =htonl (nops); -dprintk ("%s: done, status = %u\n" , __FUNCTION__,ntohl (status)); +dprintk ("%s: done, status = %u\n" , __func__,ntohl (status));return rpc_success; }
fs/nfs/client.c +4 -4
@@ -479,7 +479,7 @@ static int nfs_create_rpc_client(struct nfs_client *clp, clnt =rpc_create (&args);if (IS_ERR (clnt)) {dprintk ("%s: cannot create RPC client. Error = %ld\n" , - __FUNCTION__,PTR_ERR (clnt)); + __func__,PTR_ERR (clnt));return PTR_ERR (clnt); }
@@ -567,7 +567,7 @@ static int nfs_init_server_rpcclient(struct nfs_server *server, server->client =rpc_clone_client (clp->cl_rpcclient);if (IS_ERR (server->client)) { -dprintk ("%s: couldn't create rpc_client!\n" , __FUNCTION__); +dprintk ("%s: couldn't create rpc_client!\n" , __func__);return PTR_ERR (server->client); }
@@ -581,7 +581,7 @@ static int nfs_init_server_rpcclient(struct nfs_server *server, auth =rpcauth_create (pseudoflavour, server->client);if (IS_ERR (auth)) { -dprintk ("%s: couldn't create credcache!\n" , __FUNCTION__); +dprintk ("%s: couldn't create credcache!\n" , __func__);return PTR_ERR (auth); } }
@@ -964,7 +964,7 @@ static int nfs4_init_client(struct nfs_client *clp, error =nfs_idmap_new (clp);if (error <0 ) {dprintk ("%s: failed to create idmapper. Error = %d\n" , - __FUNCTION__, error); + __func__, error); goto error; }__set_bit (NFS_CS_IDMAP , &clp->cl_res_state);
fs/nfs/delegation.c +2 -2
@@ -60,7 +60,7 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_switch (status) {default :printk (KERN_ERR "%s: unhandled error %d.\n" , - __FUNCTION__, status); + __func__, status);case -NFS4ERR_EXPIRED :/* kill_proc(fl->fl_pid, SIGLOST, 1); */ case -NFS4ERR_STALE_CLIENTID :
@@ -186,7 +186,7 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct*/ dfprintk (FILE ,"%s: server %s handed out " "a duplicate delegation!\n" , - __FUNCTION__, clp->cl_hostname); + __func__, clp->cl_hostname);if (delegation->type <= nfsi->delegation->type) { freeme = delegation; delegation =NULL ;
fs/nfs/dir.c +9 -9
@@ -180,7 +180,7 @@ int nfs_readdir_filler(nfs_readdir_descriptor_t *desc, struct page *page)int error;dfprintk (DIRCACHE ,"NFS: %s: reading cookie %Lu into page %lu\n" , - __FUNCTION__, (long long )desc->entry->cookie, + __func__, (long long )desc->entry->cookie, page->index); again:
@@ -256,7 +256,7 @@ int find_dirent(nfs_readdir_descriptor_t *desc)while ((status =dir_decode (desc)) ==0 ) {dfprintk (DIRCACHE ,"NFS: %s: examining cookie %Lu\n" , - __FUNCTION__, (unsigned long long )entry->cookie); + __func__, (unsigned long long )entry->cookie);if (entry->prev_cookie == *desc->dir_cookie)break ;if (loop_count++ >200 ) {
@@ -315,7 +315,7 @@ int find_dirent_page(nfs_readdir_descriptor_t *desc)int status;dfprintk (DIRCACHE ,"NFS: %s: searching page %ld for target %Lu\n" , - __FUNCTION__, desc->page_index, + __func__, desc->page_index, (long long ) *desc->dir_cookie);/* If we find the page in the page_cache, we cannot be sure
@@ -339,7 +339,7 @@ int find_dirent_page(nfs_readdir_descriptor_t *desc)if (status <0 )dir_page_release (desc); out: -dfprintk (DIRCACHE ,"NFS: %s: returns %d\n" , __FUNCTION__, status); +dfprintk (DIRCACHE ,"NFS: %s: returns %d\n" , __func__, status);return status; }
@@ -380,7 +380,7 @@ int readdir_search_pagecache(nfs_readdir_descriptor_t *desc) } } -dfprintk (DIRCACHE ,"NFS: %s: returns %d\n" , __FUNCTION__, res); +dfprintk (DIRCACHE ,"NFS: %s: returns %d\n" , __func__, res);return res; }
@@ -506,7 +506,7 @@ int uncached_readdir(nfs_readdir_descriptor_t *desc, void *dirent, desc->entry->eof =0 ; out:dfprintk (DIRCACHE ,"NFS: %s: returns %d\n" , - __FUNCTION__, status); + __func__, status);return status; out_release:dir_page_release (desc);
@@ -778,7 +778,7 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)if (is_bad_inode (inode)) {dfprintk (LOOKUPCACHE ,"%s: %s/%s has dud inode\n" , - __FUNCTION__, dentry->d_parent->d_name.name, + __func__, dentry->d_parent->d_name.name, dentry->d_name.name); goto out_bad; }
@@ -806,7 +806,7 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd)unlock_kernel ();dput (parent);dfprintk (LOOKUPCACHE ,"NFS: %s(%s/%s) is valid\n" , - __FUNCTION__, dentry->d_parent->d_name.name, + __func__, dentry->d_parent->d_name.name, dentry->d_name.name);return 1 ; out_zap_parent:
@@ -825,7 +825,7 @@ out_zap_parent:unlock_kernel ();dput (parent);dfprintk (LOOKUPCACHE ,"NFS: %s(%s/%s) is invalid\n" , - __FUNCTION__, dentry->d_parent->d_name.name, + __func__, dentry->d_parent->d_name.name, dentry->d_name.name);return 0 ; }
fs/nfs/file.c +1 -1
@@ -528,7 +528,7 @@ static int do_vfs_lock(struct file *file, struct file_lock *fl)if (res <0 )dprintk (KERN_WARNING "%s: VFS is out of sync with lock manager" " - error %d!\n" , - __FUNCTION__, res); + __func__, res);return res; }
fs/nfs/inode.c +2 -2
@@ -989,7 +989,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)unsigned long now = jiffies;dfprintk (VFS ,"NFS: %s(%s/%ld ct=%d info=0x%x)\n" , - __FUNCTION__, inode->i_sb->s_id, inode->i_ino, + __func__, inode->i_sb->s_id, inode->i_ino,atomic_read (&inode->i_count), fattr->valid);if (nfsi->fileid != fattr->fileid)
@@ -1112,7 +1112,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)* Big trouble! The inode has become a different object. */ printk (KERN_DEBUG "%s: inode %ld mode changed, %07o to %07o\n" , - __FUNCTION__, inode->i_ino, inode->i_mode, fattr->mode); + __func__, inode->i_ino, inode->i_mode, fattr->mode); out_err:/* * No need to worry about unhashing the dentry, as the
fs/nfs/namespace.c +4 -4
@@ -106,7 +106,7 @@ static void * nfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd)dprintk ("--> nfs_follow_mountpoint()\n" );BUG_ON (IS_ROOT (dentry)); -dprintk ("%s: enter\n" , __FUNCTION__); +dprintk ("%s: enter\n" , __func__);dput (nd->path.dentry); nd->path.dentry =dget (dentry);
@@ -143,7 +143,7 @@ static void * nfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) nd->path.dentry =dget (mnt->mnt_root);schedule_delayed_work (&nfs_automount_task, nfs_mountpoint_expiry_timeout); out: -dprintk ("%s: done, returned %d\n" , __FUNCTION__, err); +dprintk ("%s: done, returned %d\n" , __func__, err);dprintk ("<-- nfs_follow_mountpoint() = %d\n" , err);return ERR_PTR (err);
@@ -230,7 +230,7 @@ static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent,dprintk ("--> nfs_do_submount()\n" ); -dprintk ("%s: submounting on %s/%s\n" , __FUNCTION__, +dprintk ("%s: submounting on %s/%s\n" , __func__, dentry->d_parent->d_name.name, dentry->d_name.name);if (page ==NULL )
@@ -243,7 +243,7 @@ static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent, free_page:free_page ((unsigned long )page); out: -dprintk ("%s: done\n" , __FUNCTION__); +dprintk ("%s: done\n" , __func__);dprintk ("<-- nfs_do_submount() = %p\n" , mnt);return mnt;
fs/nfs/nfs3proc.c +3 -3
@@ -63,15 +63,15 @@ do_proc_get_root(struct rpc_clnt *client, struct nfs_fh *fhandle, };int status; -dprintk ("%s: call fsinfo\n" , __FUNCTION__); +dprintk ("%s: call fsinfo\n" , __func__);nfs_fattr_init (info->fattr); status =rpc_call_sync (client, &msg,0 ); -dprintk ("%s: reply fsinfo: %d\n" , __FUNCTION__, status); +dprintk ("%s: reply fsinfo: %d\n" , __func__, status);if (!(info->fattr->valid &NFS_ATTR_FATTR )) { msg.rpc_proc = &nfs3_procedures[NFS3PROC_GETATTR ]; msg.rpc_resp = info->fattr; status =rpc_call_sync (client, &msg,0 ); -dprintk ("%s: reply getattr: %d\n" , __FUNCTION__, status); +dprintk ("%s: reply getattr: %d\n" , __func__, status); }return status; }
fs/nfs/nfs4namespace.c +6 -6
@@ -86,7 +86,7 @@ static int nfs4_validate_fspath(const struct vfsmount *mnt_parent,if (strncmp (path, fs_path,strlen (fs_path)) !=0 ) {dprintk ("%s: path %s does not begin with fsroot %s\n" , - __FUNCTION__, path, fs_path); + __func__, path, fs_path);return -ENOENT ; }
@@ -134,7 +134,7 @@ static struct vfsmount *nfs_follow_referral(const struct vfsmount *mnt_parent,if (locations ==NULL || locations->nlocations <=0 ) goto out; -dprintk ("%s: referral at %s/%s\n" , __FUNCTION__, +dprintk ("%s: referral at %s/%s\n" , __func__, dentry->d_parent->d_name.name, dentry->d_name.name); page = (char *)__get_free_page (GFP_USER );
@@ -204,7 +204,7 @@ static struct vfsmount *nfs_follow_referral(const struct vfsmount *mnt_parent, out:free_page ((unsigned long ) page);free_page ((unsigned long ) page2); -dprintk ("%s: done\n" , __FUNCTION__); +dprintk ("%s: done\n" , __func__);return mnt; }
@@ -223,7 +223,7 @@ struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentrint err;/* BUG_ON(IS_ROOT(dentry)); */ -dprintk ("%s: enter\n" , __FUNCTION__); +dprintk ("%s: enter\n" , __func__); page =alloc_page (GFP_KERNEL );if (page ==NULL )
@@ -238,7 +238,7 @@ struct vfsmount *nfs_do_refmount(const struct vfsmount *mnt_parent, struct dentr parent =dget_parent (dentry);dprintk ("%s: getting locations for %s/%s\n" , - __FUNCTION__, parent->d_name.name, dentry->d_name.name); + __func__, parent->d_name.name, dentry->d_name.name); err =nfs4_proc_fs_locations (parent->d_inode, &dentry->d_name, fs_locations, page);dput (parent);
@@ -252,6 +252,6 @@ out_free:__free_page (page);kfree (fs_locations); out: -dprintk ("%s: done\n" , __FUNCTION__); +dprintk ("%s: done\n" , __func__);return mnt; }
fs/nfs/nfs4proc.c +16 -16
@@ -72,7 +72,7 @@ int nfs4_map_errors(int err) {if (err <-1000 ) {dprintk ("%s could not handle NFSv4 error %d\n" , - __FUNCTION__, -err); + __func__, -err);return -EIO ; }return err;
@@ -1577,7 +1577,7 @@ static int nfs4_get_referral(struct inode *dir, const struct qstr *name, struct goto out;/* Make sure server returned a different fsid for the referral */ if (nfs_fsid_equal (&NFS_SERVER (dir)->fsid, &locations->fattr.fsid)) { -dprintk ("%s: server did not return a different fsid for a referral at %s\n" , __FUNCTION__, name->name); +dprintk ("%s: server did not return a different fsid for a referral at %s\n" , __func__, name->name); status = -EIO ; goto out; }
@@ -2210,7 +2210,7 @@ static int _nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, };int status; -dprintk ("%s: dentry = %s/%s, cookie = %Lu\n" , __FUNCTION__, +dprintk ("%s: dentry = %s/%s, cookie = %Lu\n" , __func__, dentry->d_parent->d_name.name, dentry->d_name.name, (unsigned long long )cookie);
@@ -2222,7 +2222,7 @@ static int _nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,nfs_invalidate_atime (dir); -dprintk ("%s: returns %d\n" , __FUNCTION__, status); +dprintk ("%s: returns %d\n" , __func__, status);return status; }
@@ -3337,7 +3337,7 @@ static void nfs4_lock_prepare(struct rpc_task *task, void *calldata)struct nfs4_lockdata *data = calldata;struct nfs4_state *state = data->lsp->ls_state; -dprintk ("%s: begin!\n" , __FUNCTION__); +dprintk ("%s: begin!\n" , __func__);if (nfs_wait_on_sequence (data->arg.lock_seqid, task) !=0 )return ;/* Do we need to do an open_to_lock_owner? */
@@ -3350,14 +3350,14 @@ static void nfs4_lock_prepare(struct rpc_task *task, void *calldata) data->arg.new_lock_owner =0 ; data->timestamp = jiffies;rpc_call_start (task); -dprintk ("%s: done!, ret = %d\n" , __FUNCTION__, data->rpc_status); +dprintk ("%s: done!, ret = %d\n" , __func__, data->rpc_status); }static void nfs4_lock_done (struct rpc_task *task,void *calldata) {struct nfs4_lockdata *data = calldata; -dprintk ("%s: begin!\n" , __FUNCTION__); +dprintk ("%s: begin!\n" , __func__); data->rpc_status = task->tk_status;if (RPC_ASSASSINATED (task))
@@ -3377,14 +3377,14 @@ static void nfs4_lock_done(struct rpc_task *task, void *calldata) }nfs_increment_lock_seqid (data->rpc_status, data->arg.lock_seqid); out: -dprintk ("%s: done, ret = %d!\n" , __FUNCTION__, data->rpc_status); +dprintk ("%s: done, ret = %d!\n" , __func__, data->rpc_status); }static void nfs4_lock_release (void *calldata) {struct nfs4_lockdata *data = calldata; -dprintk ("%s: begin!\n" , __FUNCTION__); +dprintk ("%s: begin!\n" , __func__);nfs_free_seqid (data->arg.open_seqid);if (data->cancelled !=0 ) {struct rpc_task *task;
@@ -3392,13 +3392,13 @@ static void nfs4_lock_release(void *calldata) data->arg.lock_seqid);if (!IS_ERR (task))rpc_put_task (task); -dprintk ("%s: cancelling lock!\n" , __FUNCTION__); +dprintk ("%s: cancelling lock!\n" , __func__); }else nfs_free_seqid (data->arg.lock_seqid);nfs4_put_lock_state (data->lsp);put_nfs_open_context (data->ctx);kfree (data); -dprintk ("%s: done!\n" , __FUNCTION__); +dprintk ("%s: done!\n" , __func__); }static const struct rpc_call_ops nfs4_lock_ops = {
@@ -3423,7 +3423,7 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f };int ret; -dprintk ("%s: begin!\n" , __FUNCTION__); +dprintk ("%s: begin!\n" , __func__); data =nfs4_alloc_lockdata (fl,nfs_file_open_context (fl->fl_file), fl->fl_u.nfs4_fl.owner);if (data ==NULL )
@@ -3446,7 +3446,7 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f }else data->cancelled =1 ;rpc_put_task (task); -dprintk ("%s: done, ret = %d!\n" , __FUNCTION__, ret); +dprintk ("%s: done, ret = %d!\n" , __func__, ret);return ret; }
@@ -3522,7 +3522,7 @@ static int _nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock/* Note: we always want to sleep here! */ request->fl_flags = fl_flags |FL_SLEEP ;if (do_vfs_lock (request->fl_file, request) <0 ) -printk (KERN_WARNING "%s: VFS is out of sync with lock manager!\n" , __FUNCTION__); +printk (KERN_WARNING "%s: VFS is out of sync with lock manager!\n" , __func__); out_unlock:up_read (&clp->cl_sem); out:
@@ -3660,12 +3660,12 @@ int nfs4_proc_fs_locations(struct inode *dir, const struct qstr *name, };int status; -dprintk ("%s: start\n" , __FUNCTION__); +dprintk ("%s: start\n" , __func__);nfs_fattr_init (&fs_locations->fattr); fs_locations->server = server; fs_locations->nlocations =0 ; status =rpc_call_sync (server->client, &msg,0 ); -dprintk ("%s: returned status = %d\n" , __FUNCTION__, status); +dprintk ("%s: returned status = %d\n" , __func__, status);return status; }
fs/nfs/nfs4renewd.c +5 -5
@@ -66,7 +66,7 @@ nfs4_renew_state(struct work_struct *work)unsigned long last, now;down_read (&clp->cl_sem); -dprintk ("%s: start\n" , __FUNCTION__); +dprintk ("%s: start\n" , __func__);/* Are there any active superblocks? */ if (list_empty (&clp->cl_superblocks)) goto out;
@@ -92,17 +92,17 @@ nfs4_renew_state(struct work_struct *work)spin_lock (&clp->cl_lock); }else dprintk ("%s: failed to call renewd. Reason: lease not expired \n" , - __FUNCTION__); + __func__);if (timeout <5 *HZ )/* safeguard */ timeout =5 *HZ ;dprintk ("%s: requeueing work. Lease period = %ld\n" , - __FUNCTION__, (timeout +HZ -1 ) /HZ ); + __func__, (timeout +HZ -1 ) /HZ );cancel_delayed_work (&clp->cl_renewd);schedule_delayed_work (&clp->cl_renewd, timeout);spin_unlock (&clp->cl_lock); out:up_read (&clp->cl_sem); -dprintk ("%s: done\n" , __FUNCTION__); +dprintk ("%s: done\n" , __func__); }/* Must be called with clp->cl_sem locked for writes */
@@ -117,7 +117,7 @@ nfs4_schedule_state_renewal(struct nfs_client *clp)if (timeout <5 *HZ ) timeout =5 *HZ ;dprintk ("%s: requeueing work. Lease period = %ld\n" , - __FUNCTION__, (timeout +HZ -1 ) /HZ ); + __func__, (timeout +HZ -1 ) /HZ );cancel_delayed_work (&clp->cl_renewd);schedule_delayed_work (&clp->cl_renewd, timeout);set_bit (NFS_CS_RENEWD , &clp->cl_res_state);
fs/nfs/nfs4state.c +3 -3
@@ -796,7 +796,7 @@ static int nfs4_reclaim_locks(struct nfs4_state_recovery_ops *ops, struct nfs4_sswitch (status) {default :printk (KERN_ERR "%s: unhandled error %d. Zeroing state\n" , - __FUNCTION__, status); + __func__, status);case -NFS4ERR_EXPIRED :case -NFS4ERR_NO_GRACE :case -NFS4ERR_RECLAIM_BAD :
@@ -837,14 +837,14 @@ static int nfs4_reclaim_open_state(struct nfs4_state_recovery_ops *ops, struct nlist_for_each_entry (lock, &state->lock_states, ls_locks) {if (!(lock->ls_flags &NFS_LOCK_INITIALIZED ))printk ("%s: Lock reclaim failed!\n" , - __FUNCTION__); + __func__); }continue ; }switch (status) {default :printk (KERN_ERR "%s: unhandled error %d. Zeroing state\n" , - __FUNCTION__, status); + __func__, status);case -ENOENT :case -NFS4ERR_RECLAIM_BAD :case -NFS4ERR_RECLAIM_CONFLICT :
fs/nfs/nfs4xdr.c +53 -53
401 lines not on this page · raw message
fs/nfs/proc.c +4 -4
@@ -63,17 +63,17 @@ nfs_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle, };int status; -dprintk ("%s: call getattr\n" , __FUNCTION__); +dprintk ("%s: call getattr\n" , __func__);nfs_fattr_init (fattr); status =rpc_call_sync (server->nfs_client->cl_rpcclient, &msg,0 ); -dprintk ("%s: reply getattr: %d\n" , __FUNCTION__, status); +dprintk ("%s: reply getattr: %d\n" , __func__, status);if (status)return status; -dprintk ("%s: call statfs\n" , __FUNCTION__); +dprintk ("%s: call statfs\n" , __func__); msg.rpc_proc = &nfs_procedures[NFSPROC_STATFS ]; msg.rpc_resp = &fsinfo; status =rpc_call_sync (server->nfs_client->cl_rpcclient, &msg,0 ); -dprintk ("%s: reply statfs: %d\n" , __FUNCTION__, status); +dprintk ("%s: reply statfs: %d\n" , __func__, status);if (status)return status; info->rtmax =NFS_MAXDATA ;
fs/nfs/read.c +1 -1
@@ -326,7 +326,7 @@ int nfs_readpage_result(struct rpc_task *task, struct nfs_read_data *data) {int status; -dprintk ("NFS: %s: %5u, (status %d)\n" , __FUNCTION__, task->tk_pid, +dprintk ("NFS: %s: %5u, (status %d)\n" , __func__, task->tk_pid, task->tk_status); status =NFS_PROTO (data->inode)->read_done (task, data);
fs/nfs/super.c +1 -1
@@ -405,7 +405,7 @@ static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf)return 0 ; out_err: -dprintk ("%s: statfs error = %d\n" , __FUNCTION__, -error); +dprintk ("%s: statfs error = %d\n" , __func__, -error);unlock_kernel ();return error; }
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 5/13 xfs: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- fs/xfs/linux-2.6/kmem.c | 6 +++--- fs/xfs/linux-2.6/xfs_buf.c | 6 +++--- fs/xfs/linux-2.6/xfs_super.c | 2 +- fs/xfs/linux-2.6/xfs_vnode.h | 4 ++-- fs/xfs/xfs_alloc.c | 18 +++++++++--------- fs/xfs/xfs_bmap.c | 18 +++++++++--------- fs/xfs/xfs_bmap.h | 2 +- fs/xfs/xfs_bmap_btree.c | 16 ++++++++-------- fs/xfs/xfs_filestream.c | 2 +- fs/xfs/xfs_log.c | 2 +- fs/xfs/xfs_log_recover.c | 4 ++-- fs/xfs/xfs_trans_ail.c | 2 +- 12 files changed, 41 insertions(+), 41 deletions(-)
fs/xfs/linux-2.6/kmem.c +3 -3
@@ -37,7 +37,7 @@ kmem_alloc(size_t size, unsigned int __nocast flags)#ifdef DEBUG if (unlikely (!(flags &KM_LARGE ) && (size >PAGE_SIZE ))) {printk (KERN_WARNING "Large %s attempt, size=%ld\n" , - __FUNCTION__, (long )size); + __func__, (long )size);dump_stack (); }#endif
@@ -52,7 +52,7 @@ kmem_alloc(size_t size, unsigned int __nocast flags)if (!(++retries %100 ))printk (KERN_ERR "XFS: possible memory allocation " "deadlock in %s (mode:0x%x)\n" , - __FUNCTION__, lflags); + __func__, lflags);congestion_wait (WRITE ,HZ /50 ); }while (1 ); }
@@ -129,7 +129,7 @@ kmem_zone_alloc(kmem_zone_t *zone, unsigned int __nocast flags)if (!(++retries %100 ))printk (KERN_ERR "XFS: possible memory allocation " "deadlock in %s (mode:0x%x)\n" , - __FUNCTION__, lflags); + __func__, lflags);congestion_wait (WRITE ,HZ /50 ); }while (1 ); }
fs/xfs/linux-2.6/xfs_buf.c +3 -3
@@ -400,7 +400,7 @@ _xfs_buf_lookup_pages(printk (KERN_ERR "XFS: possible memory allocation " "deadlock in %s (mode:0x%x)\n" , - __FUNCTION__, gfp_mask); + __func__, gfp_mask);XFS_STATS_INC (xb_page_retries);xfsbufd_wakeup (0 , gfp_mask);
@@ -598,7 +598,7 @@ xfs_buf_get_flags( error =_xfs_buf_map_pages (bp, flags);if (unlikely (error)) {printk (KERN_WARNING "%s: failed to map pages\n" , - __FUNCTION__); + __func__); goto no_buffer; } }
@@ -778,7 +778,7 @@ xfs_buf_get_noaddr( error =_xfs_buf_map_pages (bp,XBF_MAPPED );if (unlikely (error)) {printk (KERN_WARNING "%s: failed to map pages\n" , - __FUNCTION__); + __func__); goto fail_free_mem; }
fs/xfs/linux-2.6/xfs_super.c +1 -1
@@ -934,7 +934,7 @@ xfs_fs_clear_inode(xfs_inactive (ip);xfs_iflags_clear (ip,XFS_IMODIFIED );if (xfs_reclaim (ip)) -panic ("%s: cannot reclaim 0x%p\n" , __FUNCTION__, inode); +panic ("%s: cannot reclaim 0x%p\n" , __func__, inode); }ASSERT (XFS_I (inode) ==NULL );
fs/xfs/linux-2.6/xfs_vnode.h +2 -2
@@ -303,9 +303,9 @@ extern void xfs_itrace_hold(struct xfs_inode *, char *, int, inst_t *);extern void _xfs_itrace_ref (struct xfs_inode *,char *,int ,inst_t *);extern void xfs_itrace_rele (struct xfs_inode *,char *,int ,inst_t *);#define xfs_itrace_entry (ip) \ - _xfs_itrace_entry(ip, __FUNCTION__, (inst_t *)__return_address) + _xfs_itrace_entry(ip, __func__, (inst_t *)__return_address)#define xfs_itrace_exit (ip) \ - _xfs_itrace_exit(ip, __FUNCTION__, (inst_t *)__return_address) + _xfs_itrace_exit(ip, __func__, (inst_t *)__return_address)#define xfs_itrace_exit_tag (ip, tag) \ _xfs_itrace_exit(ip, tag, (inst_t *)__return_address)#define xfs_itrace_ref (ip) \
fs/xfs/xfs_alloc.c +9 -9
@@ -55,17 +55,17 @@ xfs_alloc_search_busy(xfs_trans_t *tp,ktrace_t *xfs_alloc_trace_buf;#define TRACE_ALLOC (s,a) \ - xfs_alloc_trace_alloc(__FUNCTION__, s, a, __LINE__) + xfs_alloc_trace_alloc(__func__, s, a, __LINE__)#define TRACE_FREE (s,a,b,x,f) \ - xfs_alloc_trace_free(__FUNCTION__, s, mp, a, b, x, f, __LINE__) + xfs_alloc_trace_free(__func__, s, mp, a, b, x, f, __LINE__)#define TRACE_MODAGF (s,a,f) \ - xfs_alloc_trace_modagf(__FUNCTION__, s, mp, a, f, __LINE__) -#define TRACE_BUSY (__FUNCTION__,s,ag,agb,l,sl,tp) \ - xfs_alloc_trace_busy(__FUNCTION__, s, mp, ag, agb, l, sl, tp, XFS_ALLOC_KTRACE_BUSY, __LINE__) -#define TRACE_UNBUSY (__FUNCTION__,s,ag,sl,tp) \ - xfs_alloc_trace_busy(__FUNCTION__, s, mp, ag, -1, -1, sl, tp, XFS_ALLOC_KTRACE_UNBUSY, __LINE__) -#define TRACE_BUSYSEARCH (__FUNCTION__,s,ag,agb,l,sl,tp) \ - xfs_alloc_trace_busy(__FUNCTION__, s, mp, ag, agb, l, sl, tp, XFS_ALLOC_KTRACE_BUSYSEARCH, __LINE__) + xfs_alloc_trace_modagf(__func__, s, mp, a, f, __LINE__) +#define TRACE_BUSY (__func__,s,ag,agb,l,sl,tp) \ + xfs_alloc_trace_busy(__func__, s, mp, ag, agb, l, sl, tp, XFS_ALLOC_KTRACE_BUSY, __LINE__) +#define TRACE_UNBUSY (__func__,s,ag,sl,tp) \ + xfs_alloc_trace_busy(__func__, s, mp, ag, -1, -1, sl, tp, XFS_ALLOC_KTRACE_UNBUSY, __LINE__) +#define TRACE_BUSYSEARCH (__func__,s,ag,agb,l,sl,tp) \ + xfs_alloc_trace_busy(__func__, s, mp, ag, agb, l, sl, tp, XFS_ALLOC_KTRACE_BUSYSEARCH, __LINE__)#else #define TRACE_ALLOC (s,a)#define TRACE_FREE (s,a,b,x,f)
fs/xfs/xfs_bmap.c +9 -9
@@ -323,13 +323,13 @@ xfs_bmap_trace_pre_update( int whichfork); /* data or attr fork */#define XFS_BMAP_TRACE_DELETE (d,ip,i,c,w) \ - xfs_bmap_trace_delete(__FUNCTION__,d,ip,i,c,w) + xfs_bmap_trace_delete(__func__,d,ip,i,c,w)#define XFS_BMAP_TRACE_INSERT (d,ip,i,c,r1,r2,w) \ - xfs_bmap_trace_insert(__FUNCTION__,d,ip,i,c,r1,r2,w) + xfs_bmap_trace_insert(__func__,d,ip,i,c,r1,r2,w)#define XFS_BMAP_TRACE_POST_UPDATE (d,ip,i,w) \ - xfs_bmap_trace_post_update(__FUNCTION__,d,ip,i,w) + xfs_bmap_trace_post_update(__func__,d,ip,i,w)#define XFS_BMAP_TRACE_PRE_UPDATE (d,ip,i,w) \ - xfs_bmap_trace_pre_update(__FUNCTION__,d,ip,i,w) + xfs_bmap_trace_pre_update(__func__,d,ip,i,w)#else #define XFS_BMAP_TRACE_DELETE (d,ip,i,c,w)#define XFS_BMAP_TRACE_INSERT (d,ip,i,c,r1,r2,w)
@@ -6162,10 +6162,10 @@ xfs_check_block( }if (*thispa == *pp) {cmn_err (CE_WARN ,"%s: thispa(%d) == pp(%d) %Ld" , - __FUNCTION__, j, i, + __func__, j, i, (unsigned long long )be64_to_cpu (*thispa));panic ("%s: ptrs are equal in node\n" , - __FUNCTION__); + __func__); } } }
@@ -6325,13 +6325,13 @@ xfs_bmap_check_leaf_extents(return ; error0: -cmn_err (CE_WARN ,"%s: at error0" , __FUNCTION__); +cmn_err (CE_WARN ,"%s: at error0" , __func__);if (bp_release)xfs_trans_brelse (NULL , bp); error_norelse:cmn_err (CE_WARN ,"%s: BAD after btree leaves for %d extents" , - __FUNCTION__, i); -panic ("%s: CORRUPTED BTREE OR SOMETHING" , __FUNCTION__); + __func__, i); +panic ("%s: CORRUPTED BTREE OR SOMETHING" , __func__); return; }#endif
fs/xfs/xfs_bmap.h +1 -1
@@ -151,7 +151,7 @@ xfs_bmap_trace_exlist(xfs_extnum_t cnt,/* count of entries in list */ int whichfork); /* data or attr fork */#define XFS_BMAP_TRACE_EXLIST (ip,c,w) \ - xfs_bmap_trace_exlist(__FUNCTION__,ip,c,w) + xfs_bmap_trace_exlist(__func__,ip,c,w)#else #define XFS_BMAP_TRACE_EXLIST (ip,c,w)#endif
fs/xfs/xfs_bmap_btree.c +8 -8
@@ -275,21 +275,21 @@ xfs_bmbt_trace_cursor( }#define XFS_BMBT_TRACE_ARGBI (c,b,i) \ - xfs_bmbt_trace_argbi(__FUNCTION__, c, b, i, __LINE__) + xfs_bmbt_trace_argbi(__func__, c, b, i, __LINE__)#define XFS_BMBT_TRACE_ARGBII (c,b,i,j) \ - xfs_bmbt_trace_argbii(__FUNCTION__, c, b, i, j, __LINE__) + xfs_bmbt_trace_argbii(__func__, c, b, i, j, __LINE__)#define XFS_BMBT_TRACE_ARGFFFI (c,o,b,i,j) \ - xfs_bmbt_trace_argfffi(__FUNCTION__, c, o, b, i, j, __LINE__) + xfs_bmbt_trace_argfffi(__func__, c, o, b, i, j, __LINE__)#define XFS_BMBT_TRACE_ARGI (c,i) \ - xfs_bmbt_trace_argi(__FUNCTION__, c, i, __LINE__) + xfs_bmbt_trace_argi(__func__, c, i, __LINE__)#define XFS_BMBT_TRACE_ARGIFK (c,i,f,s) \ - xfs_bmbt_trace_argifk(__FUNCTION__, c, i, f, s, __LINE__) + xfs_bmbt_trace_argifk(__func__, c, i, f, s, __LINE__)#define XFS_BMBT_TRACE_ARGIFR (c,i,f,r) \ - xfs_bmbt_trace_argifr(__FUNCTION__, c, i, f, r, __LINE__) + xfs_bmbt_trace_argifr(__func__, c, i, f, r, __LINE__)#define XFS_BMBT_TRACE_ARGIK (c,i,k) \ - xfs_bmbt_trace_argik(__FUNCTION__, c, i, k, __LINE__) + xfs_bmbt_trace_argik(__func__, c, i, k, __LINE__)#define XFS_BMBT_TRACE_CURSOR (c,s) \ - xfs_bmbt_trace_cursor(__FUNCTION__, c, s, __LINE__) + xfs_bmbt_trace_cursor(__func__, c, s, __LINE__)#else #define XFS_BMBT_TRACE_ARGBI (c,b,i)#define XFS_BMBT_TRACE_ARGBII (c,b,i,j)
fs/xfs/xfs_filestream.c +1 -1
@@ -73,7 +73,7 @@ xfs_filestreams_trace(#define TRACE4 (mp,t,a0,a1,a2,a3) TRACE6(mp,t,a0,a1,a2,a3,0,0)#define TRACE5 (mp,t,a0,a1,a2,a3,a4) TRACE6(mp,t,a0,a1,a2,a3,a4,0)#define TRACE6 (mp,t,a0,a1,a2,a3,a4,a5) \ - xfs_filestreams_trace(mp, t, __FUNCTION__, __LINE__, \ + xfs_filestreams_trace(mp, t, __func__, __LINE__, \ (__psunsigned_t)a0, (__psunsigned_t)a1, \ (__psunsigned_t)a2, (__psunsigned_t)a3, \ (__psunsigned_t)a4, (__psunsigned_t)a5)
fs/xfs/xfs_log.c +1 -1
@@ -2241,7 +2241,7 @@ xlog_state_do_callback( repeats =0 ;xfs_fs_cmn_err (CE_WARN , log->l_mp,"%s: possible infinite loop (%d iterations)" , - __FUNCTION__, flushcnt); + __func__, flushcnt); } }while (!ioerrors && loopdidcallbacks);
fs/xfs/xfs_log_recover.c +2 -2
@@ -191,7 +191,7 @@ xlog_header_check_dump( {int b; -cmn_err (CE_DEBUG ,"%s: SB : uuid = " , __FUNCTION__); +cmn_err (CE_DEBUG ,"%s: SB : uuid = " , __func__);for (b =0 ; b <16 ; b++)cmn_err (CE_DEBUG ,"%02x" , ((uchar_t *)&mp->m_sb.sb_uuid)[b]);cmn_err (CE_DEBUG ,", fmt = %d\n" ,XLOG_FMT );
@@ -3445,7 +3445,7 @@ xlog_valid_rec_header( (!rhead->h_version || (be32_to_cpu(rhead->h_version) & (~XLOG_VERSION_OKBITS))))) {xlog_warn ("XFS: %s: unrecognised log version (%d)." , - __FUNCTION__,be32_to_cpu (rhead->h_version)); + __func__,be32_to_cpu (rhead->h_version));return XFS_ERROR (EIO ); }
fs/xfs/xfs_trans_ail.c +1 -1
@@ -437,7 +437,7 @@ xfs_trans_delete_ail(else {xfs_cmn_err (XFS_PTAG_AILDELETE ,CE_ALERT , mp,"%s: attempting to delete a log item that is not in the AIL" , - __FUNCTION__); + __func__);spin_unlock (&mp->m_ail_lock);xfs_force_shutdown (mp,SHUTDOWN_CORRUPT_INCORE ); }
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 6/13 ecryptfs: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- fs/ecryptfs/crypto.c | 32 ++++++++++++++++---------------- fs/ecryptfs/ecryptfs_kernel.h | 2 +- fs/ecryptfs/inode.c | 2 +- fs/ecryptfs/main.c | 2 +- fs/ecryptfs/mmap.c | 10 +++++----- fs/ecryptfs/read_write.c | 16 ++++++++-------- 6 files changed, 32 insertions(+), 32 deletions(-)
fs/ecryptfs/crypto.c +16 -16
@@ -119,21 +119,21 @@ static int ecryptfs_calculate_md5(char *dst,if (rc) {printk (KERN_ERR "%s: Error initializing crypto hash; rc = [%d]\n" , - __FUNCTION__, rc); + __func__, rc); goto out; } rc =crypto_hash_update (&desc, &sg, len);if (rc) {printk (KERN_ERR "%s: Error updating crypto hash; rc = [%d]\n" , - __FUNCTION__, rc); + __func__, rc); goto out; } rc =crypto_hash_final (&desc, dst);if (rc) {printk (KERN_ERR "%s: Error finalizing crypto hash; rc = [%d]\n" , - __FUNCTION__, rc); + __func__, rc); goto out; } out:
@@ -437,7 +437,7 @@ static int ecryptfs_encrypt_extent(struct page *enc_extent_page,if (rc <0 ) {printk (KERN_ERR "%s: Error attempting to encrypt page with " "page->index = [%ld], extent_offset = [%ld]; " -"rc = [%d]\n" , __FUNCTION__, page->index, extent_offset, +"rc = [%d]\n" , __func__, page->index, extent_offset, rc); goto out; }
@@ -487,7 +487,7 @@ int ecryptfs_encrypt_page(struct page *page) 0, PAGE_CACHE_SIZE);if (rc)printk (KERN_ERR "%s: Error attempting to copy " -"page at index [%ld]\n" , __FUNCTION__, +"page at index [%ld]\n" , __func__, page->index); goto out; }
@@ -508,7 +508,7 @@ int ecryptfs_encrypt_page(struct page *page) extent_offset);if (rc) {printk (KERN_ERR "%s: Error encrypting extent; " -"rc = [%d]\n" , __FUNCTION__, rc); +"rc = [%d]\n" , __func__, rc); goto out; } ecryptfs_lower_offset_for_extent(
@@ -569,7 +569,7 @@ static int ecryptfs_decrypt_extent(struct page *page,if (rc <0 ) {printk (KERN_ERR "%s: Error attempting to decrypt to page with " "page->index = [%ld], extent_offset = [%ld]; " -"rc = [%d]\n" , __FUNCTION__, page->index, extent_offset, +"rc = [%d]\n" , __func__, page->index, extent_offset, rc); goto out; }
@@ -622,7 +622,7 @@ int ecryptfs_decrypt_page(struct page *page) ecryptfs_inode);if (rc)printk (KERN_ERR "%s: Error attempting to copy " -"page at index [%ld]\n" , __FUNCTION__, +"page at index [%ld]\n" , __func__, page->index); goto out; }
@@ -656,7 +656,7 @@ int ecryptfs_decrypt_page(struct page *page) extent_offset);if (rc) {printk (KERN_ERR "%s: Error encrypting extent; " -"rc = [%d]\n" , __FUNCTION__, rc); +"rc = [%d]\n" , __func__, rc); goto out; } }
@@ -1215,7 +1215,7 @@ int ecryptfs_read_and_validate_header_region(char *data, ecryptfs_inode);if (rc) {printk (KERN_ERR "%s: Error reading header region; rc = [%d]\n" , - __FUNCTION__, rc); + __func__, rc); goto out; }if (!contains_ecryptfs_marker (data +ECRYPTFS_FILE_SIZE_BYTES )) {
@@ -1320,7 +1320,7 @@ ecryptfs_write_metadata_to_contents(struct ecryptfs_crypt_stat *crypt_stat, 0, crypt_stat->num_header_bytes_at_front);if (rc)printk (KERN_ERR "%s: Error attempting to write header " -"information to lower file; rc = [%d]\n" , __FUNCTION__, +"information to lower file; rc = [%d]\n" , __func__, rc);return rc; }
@@ -1365,14 +1365,14 @@ int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry) } }else {printk (KERN_WARNING "%s: Encrypted flag not set\n" , - __FUNCTION__); + __func__); rc = -EINVAL ; goto out; }/* Released in this function */ virt =kzalloc (crypt_stat->num_header_bytes_at_front,GFP_KERNEL );if (!virt) { -printk (KERN_ERR "%s: Out of memory\n" , __FUNCTION__); +printk (KERN_ERR "%s: Out of memory\n" , __func__); rc = -ENOMEM ; goto out; }
@@ -1380,7 +1380,7 @@ int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry) ecryptfs_dentry);if (unlikely (rc)) {printk (KERN_ERR "%s: Error whilst writing headers; rc = [%d]\n" , - __FUNCTION__, rc); + __func__, rc); goto out_free; }if (crypt_stat->flags &ECRYPTFS_METADATA_IN_XATTR )
@@ -1391,7 +1391,7 @@ int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry) ecryptfs_dentry, virt);if (rc) {printk (KERN_ERR "%s: Error writing metadata out to lower file; " -"rc = [%d]\n" , __FUNCTION__, rc); +"rc = [%d]\n" , __func__, rc); goto out_free; } out_free:
@@ -1585,7 +1585,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)if (!page_virt) { rc = -ENOMEM ;printk (KERN_ERR "%s: Unable to allocate page_virt\n" , - __FUNCTION__); + __func__); goto out; } rc = ecryptfs_read_lower(page_virt, 0, crypt_stat->extent_size,
fs/ecryptfs/ecryptfs_kernel.h +1 -1
@@ -500,7 +500,7 @@ ecryptfs_set_dentry_lower_mnt(struct dentry *dentry, struct vfsmount *lower_mnt) } #define ecryptfs_printk(type, fmt, arg...) \ - __ecryptfs_printk(type "%s: " fmt, __FUNCTION__, ## arg); + __ecryptfs_printk(type "%s: " fmt, __func__, ## arg);void __ecryptfs_printk (const char *fmt, ...);extern const struct file_operations ecryptfs_main_fops;
fs/ecryptfs/inode.c +1 -1
@@ -121,7 +121,7 @@ ecryptfs_do_create(struct inode *directory_inode, ecryptfs_dentry, mode, nd);if (rc) {printk (KERN_ERR "%s: Failure to create dentry in lower fs; " -"rc = [%d]\n" , __FUNCTION__, rc); +"rc = [%d]\n" , __func__, rc); goto out_lock; } rc = ecryptfs_interpose(lower_dentry, ecryptfs_dentry,
fs/ecryptfs/main.c +1 -1
@@ -219,7 +219,7 @@ int ecryptfs_interpose(struct dentry *lower_dentry, struct dentry *dentry,if (rc) {printk (KERN_ERR "%s: Error attempting to initialize the " "persistent file for the dentry with name [%s]; " -"rc = [%d]\n" , __FUNCTION__, dentry->d_name.name, rc); +"rc = [%d]\n" , __func__, dentry->d_name.name, rc); goto out; } out:
fs/ecryptfs/mmap.c +5 -5
@@ -153,7 +153,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,flush_dcache_page (page);if (rc) {printk (KERN_ERR "%s: Error reading xattr " -"region; rc = [%d]\n" , __FUNCTION__, rc); +"region; rc = [%d]\n" , __func__, rc); goto out; } }else {
@@ -169,7 +169,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page,if (rc) {printk (KERN_ERR "%s: Error attempting to read " "extent at offset [%lld] in the lower " -"file; rc = [%d]\n" , __FUNCTION__, +"file; rc = [%d]\n" , __func__, lower_offset, rc); goto out; }
@@ -212,7 +212,7 @@ static int ecryptfs_readpage(struct file *file, struct page *page)"the encrypted content from the lower " "file whilst inserting the metadata " "from the xattr into the header; rc = " - "[%d]\n", __FUNCTION__, rc); + "[%d]\n", __func__, rc); goto out; }
@@ -276,7 +276,7 @@ static int ecryptfs_prepare_write(struct file *file, struct page *page, page->mapping->host);if (rc) {printk (KERN_ERR "%s: Error attemping to read lower " -"page segment; rc = [%d]\n" , __FUNCTION__, rc); +"page segment; rc = [%d]\n" , __func__, rc);ClearPageUptodate (page); goto out; }else
@@ -339,7 +339,7 @@ static int ecryptfs_write_inode_size_to_header(struct inode *ecryptfs_inode)kfree (file_size_virt);if (rc)printk (KERN_ERR "%s: Error writing file size to header; " -"rc = [%d]\n" , __FUNCTION__, rc); +"rc = [%d]\n" , __func__, rc); out:return rc; }
fs/ecryptfs/read_write.c +8 -8
@@ -55,7 +55,7 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,set_fs (fs_save);if (octets_written <0 ) {printk (KERN_ERR "%s: octets_written = [%td]; " -"expected [%td]\n" , __FUNCTION__, octets_written, size); +"expected [%td]\n" , __func__, octets_written, size); rc = -EINVAL ; }mutex_unlock (&inode_info->lower_file_mutex);
@@ -153,7 +153,7 @@ int ecryptfs_write(struct file *ecryptfs_file, char *data, loff_t offset, rc =PTR_ERR (ecryptfs_page);printk (KERN_ERR "%s: Error getting page at " "index [%ld] from eCryptfs inode " -"mapping; rc = [%d]\n" , __FUNCTION__, +"mapping; rc = [%d]\n" , __func__, ecryptfs_page_idx, rc); goto out; }
@@ -165,7 +165,7 @@ int ecryptfs_write(struct file *ecryptfs_file, char *data, loff_t offset,if (rc) {printk (KERN_ERR "%s: Error decrypting " "page; rc = [%d]\n" , - __FUNCTION__, rc); + __func__, rc);ClearPageUptodate (ecryptfs_page);page_cache_release (ecryptfs_page); goto out;
@@ -202,7 +202,7 @@ int ecryptfs_write(struct file *ecryptfs_file, char *data, loff_t offset,page_cache_release (ecryptfs_page);if (rc) {printk (KERN_ERR "%s: Error encrypting " -"page; rc = [%d]\n" , __FUNCTION__, rc); +"page; rc = [%d]\n" , __func__, rc); goto out; } pos += num_bytes;
@@ -254,7 +254,7 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,set_fs (fs_save);if (octets_read <0 ) {printk (KERN_ERR "%s: octets_read = [%td]; " -"expected [%td]\n" , __FUNCTION__, octets_read, size); +"expected [%td]\n" , __func__, octets_read, size); rc = -EINVAL ; }mutex_unlock (&inode_info->lower_file_mutex);
@@ -327,7 +327,7 @@ int ecryptfs_read(char *data, loff_t offset, size_t size,printk (KERN_ERR "%s: Attempt to read data past the end of the " "file; offset = [%lld]; size = [%td]; " "ecryptfs_file_size = [%lld]\n" , - __FUNCTION__, offset, size, ecryptfs_file_size); + __func__, offset, size, ecryptfs_file_size); goto out; } pos = offset;
@@ -345,14 +345,14 @@ int ecryptfs_read(char *data, loff_t offset, size_t size, rc =PTR_ERR (ecryptfs_page);printk (KERN_ERR "%s: Error getting page at " "index [%ld] from eCryptfs inode " -"mapping; rc = [%d]\n" , __FUNCTION__, +"mapping; rc = [%d]\n" , __func__, ecryptfs_page_idx, rc); goto out; } rc =ecryptfs_decrypt_page (ecryptfs_page);if (rc) {printk (KERN_ERR "%s: Error decrypting " -"page; rc = [%d]\n" , __FUNCTION__, rc); +"page; rc = [%d]\n" , __func__, rc);ClearPageUptodate (ecryptfs_page);page_cache_release (ecryptfs_page); goto out;
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 7/13 cifs: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- fs/cifs/cifs_dfs_ref.c | 18 +++++++++--------- fs/cifs/cifsproto.h | 4 ++-- fs/cifs/dns_resolve.c | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-)
fs/cifs/cifs_dfs_ref.c +9 -9
@@ -74,7 +74,7 @@ static char *cifs_get_share_name(const char *node_name) pSep =memchr (UNC +2 ,'\\' , len-2 );if (!pSep) {cERROR (1 , ("%s: no server name end in node name: %s" , - __FUNCTION__, node_name)); + __func__, node_name));kfree (UNC );return NULL ; }
@@ -84,7 +84,7 @@ static char *cifs_get_share_name(const char *node_name) pSep =memchr (UNC +(pSep-UNC ),'\\' , len-(pSep-UNC ));if (!pSep) {cERROR (1 , ("%s:2 cant find share name in node name: %s" , - __FUNCTION__, node_name)); + __func__, node_name));kfree (UNC );return NULL ; }
@@ -127,7 +127,7 @@ static char *compose_mount_options(const char *sb_mountdata, rc =dns_resolve_server_name_to_ip (*devname, &srvIP);if (rc !=0 ) {cERROR (1 , ("%s: Failed to resolve server part of %s to IP" , - __FUNCTION__, *devname)); + __func__, *devname)); mountdata =ERR_PTR (rc); goto compose_mount_options_out; }
@@ -181,8 +181,8 @@ static char *compose_mount_options(const char *sb_mountdata, } } -/*cFYI(1,("%s: parent mountdata: %s", __FUNCTION__,sb_mountdata));*/ -/*cFYI(1, ("%s: submount mountdata: %s", __FUNCTION__, mountdata ));*/ +/*cFYI(1,("%s: parent mountdata: %s", __func__,sb_mountdata));*/ +/*cFYI(1, ("%s: submount mountdata: %s", __func__, mountdata ));*/ compose_mount_options_out:kfree (srvIP);
@@ -302,7 +302,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd)int rc =0 ;struct vfsmount *mnt =ERR_PTR (-ENOENT ); -cFYI (1 , ("in %s" , __FUNCTION__)); +cFYI (1 , ("in %s" , __func__));BUG_ON (IS_ROOT (dentry)); xid =GetXid ();
@@ -336,7 +336,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) len =strlen (referrals[i].node_name);if (len <2 ) {cERROR (1 , ("%s: Net Address path too short: %s" , - __FUNCTION__, referrals[i].node_name)); + __func__, referrals[i].node_name)); rc = -EINVAL ; goto out_err; }
@@ -344,7 +344,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) nd->path.dentry, referrals[i].node_name);cFYI (1 , ("%s: cifs_dfs_do_refmount:%s , mnt:%p" , - __FUNCTION__, + __func__, referrals[i].node_name, mnt));/* complete mount procedure if we accured submount */
@@ -365,7 +365,7 @@ out:FreeXid (xid);free_dfs_info_array (referrals, num_referrals);kfree (full_path); -cFYI (1 , ("leaving %s" , __FUNCTION__)); +cFYI (1 , ("leaving %s" , __func__));return ERR_PTR (rc); out_err:path_put (&nd->path);
fs/cifs/cifsproto.h +2 -2
@@ -39,8 +39,8 @@ extern int smb_send(struct socket *, struct smb_hdr *, unsigned int /* length */ , struct sockaddr *);extern unsigned int _GetXid (void );extern void _FreeXid (unsigned int ); -#define GetXid () (int)_GetXid(); cFYI(1,("CIFS VFS: in %s as Xid: %d with uid: %d",__FUNCTION__, xid,current->fsuid)); -#define FreeXid (curr_xid) {_FreeXid(curr_xid); cFYI(1,("CIFS VFS: leaving %s (xid = %d) rc = %d",__FUNCTION__,curr_xid,(int)rc));} +#define GetXid () (int)_GetXid(); cFYI(1,("CIFS VFS: in %s as Xid: %d with uid: %d",__func__, xid,current->fsuid)); +#define FreeXid (curr_xid) {_FreeXid(curr_xid); cFYI(1,("CIFS VFS: leaving %s (xid = %d) rc = %d",__func__,curr_xid,(int)rc));}extern char *build_path_from_dentry (struct dentry *);extern char *build_wildcard_path_from_dentry (struct dentry *direntry);/* extern void renew_parental_timestamps(struct dentry *direntry);*/
fs/cifs/dns_resolve.c +4 -4
@@ -77,14 +77,14 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)/* search for server name delimiter */ len =strlen (unc);if (len <3 ) { -cFYI (1 , ("%s: unc is too short: %s" , __FUNCTION__, unc)); +cFYI (1 , ("%s: unc is too short: %s" , __func__, unc));return -EINVAL ; } len -=2 ; name =memchr (unc+2 ,'\\' , len);if (!name) {cFYI (1 , ("%s: probably server name is whole unc: %s" , - __FUNCTION__, unc)); + __func__, unc)); }else { len = (name - unc) -2 /* leading // */ ; }
@@ -104,7 +104,7 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr)if (*ip_addr) {memcpy (*ip_addr, rkey->payload.data, len); (*ip_addr)[len] ='\0' ; -cFYI (1 , ("%s: resolved: %s to %s" , __FUNCTION__, +cFYI (1 , ("%s: resolved: %s to %s" , __func__, rkey->description, *ip_addr ));
@@ -114,7 +114,7 @@ dns_resolve_server_name_to_ip(const char *unc, char **ip_addr) }key_put (rkey); }else { -cERROR (1 , ("%s: unable to resolve: %s" , __FUNCTION__, name)); +cERROR (1 , ("%s: unable to resolve: %s" , __func__, name)); }kfree (name);
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 8/13 reiserfs: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- fs/reiserfs/bitmap.c | 8 ++++---- fs/reiserfs/journal.c | 8 ++++---- fs/reiserfs/namei.c | 8 ++++---- fs/reiserfs/objectid.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-)
fs/reiserfs/bitmap.c +4 -4
@@ -479,7 +479,7 @@ static void __discard_prealloc(struct reiserfs_transaction_handle *th,if (ei->i_prealloc_count <0 )reiserfs_warning (th->t_super,"zam-4001:%s: inode has negative prealloc blocks count." , - __FUNCTION__); + __func__);#endif while (ei->i_prealloc_count >0 ) {reiserfs_free_prealloc_block (th, inode, ei->i_prealloc_block);
@@ -517,7 +517,7 @@ void reiserfs_discard_all_prealloc(struct reiserfs_transaction_handle *th)if (!ei->i_prealloc_count) {reiserfs_warning (th->t_super,"zam-4001:%s: inode is in prealloc list but has no preallocated blocks." , - __FUNCTION__); + __func__); }#endif __discard_prealloc (th, ei);
@@ -632,7 +632,7 @@ int reiserfs_parse_alloc_options(struct super_block *s, char *options) }reiserfs_warning (s,"zam-4001: %s : unknown option - %s" , - __FUNCTION__, this_char); + __func__, this_char);return 1 ; }
@@ -1254,7 +1254,7 @@ struct buffer_head *reiserfs_read_bitmap_block(struct super_block *sb, bh =sb_bread (sb, block);if (bh ==NULL )reiserfs_warning (sb,"sh-2029: %s: bitmap block (#%u) " -"reading failed" , __FUNCTION__, block); +"reading failed" , __func__, block);else {if (buffer_locked (bh)) {PROC_INFO_INC (sb, scan_bitmap.wait);
fs/reiserfs/journal.c +4 -4
@@ -1187,7 +1187,7 @@ static int flush_commit_list(struct super_block *s,if (retval)reiserfs_abort (s, retval,"Journal write error in %s" , - __FUNCTION__); + __func__);put_fs_excl ();return retval; }
@@ -1534,7 +1534,7 @@ static int flush_journal_list(struct super_block *s,reiserfs_warning (s,"clm-2082: Unable to flush buffer %llu in %s" , (unsigned long long )saved_bh-> - b_blocknr, __FUNCTION__); + b_blocknr, __func__); } free_cnode: last = cn;
@@ -1586,7 +1586,7 @@ static int flush_journal_list(struct super_block *s,if (err)reiserfs_abort (s, -EIO ,"Write error while pushing transaction to disk in %s" , - __FUNCTION__); + __func__); flush_older_and_return:/* before we can update the journal header block, we _must_ flush all
@@ -1616,7 +1616,7 @@ static int flush_journal_list(struct super_block *s,if (err)reiserfs_abort (s, -EIO ,"Write error while updating journal header in %s" , - __FUNCTION__); + __func__); }remove_all_from_journal_list (s, jl,0 );list_del_init (&jl->j_list);
fs/reiserfs/namei.c +4 -4
@@ -301,7 +301,7 @@ static int reiserfs_find_entry(struct inode *dir, const char *name, int namelen, path_to_entry, de);if (retval ==IO_ERROR ) {reiserfs_warning (dir->i_sb,"zam-7001: io error in %s" , - __FUNCTION__); + __func__);return IO_ERROR ; }
@@ -496,7 +496,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th,reiserfs_warning (dir->i_sb,"zam-7002:%s: \"reiserfs_find_entry\" " "has returned unexpected value (%d)" , - __FUNCTION__, retval); + __func__, retval); }return -EEXIST ;
@@ -907,7 +907,7 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry)if (inode->i_nlink !=2 && inode->i_nlink !=1 )reiserfs_warning (inode->i_sb,"%s: empty directory has nlink " -"!= 2 (%d)" , __FUNCTION__, inode->i_nlink); +"!= 2 (%d)" , __func__, inode->i_nlink);clear_nlink (inode); inode->i_ctime = dir->i_ctime = dir->i_mtime =CURRENT_TIME_SEC ;
@@ -984,7 +984,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry)if (!inode->i_nlink) {reiserfs_warning (inode->i_sb,"%s: deleting nonexistent file " -"(%s:%lu), %d" , __FUNCTION__, +"(%s:%lu), %d" , __func__,reiserfs_bdevname (inode->i_sb), inode->i_ino, inode->i_nlink); inode->i_nlink =1 ;
fs/reiserfs/objectid.c +1 -1
@@ -61,7 +61,7 @@ __u32 reiserfs_get_unused_objectid(struct reiserfs_transaction_handle *th)/* comment needed -Hans */ unused_objectid =le32_to_cpu (map[1 ]);if (unused_objectid ==U32_MAX ) { -reiserfs_warning (s,"%s: no more object ids" , __FUNCTION__); +reiserfs_warning (s,"%s: no more object ids" , __func__);reiserfs_restore_prepared_buffer (s,SB_BUFFER_WITH_SB (s));return 0 ; }
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 9/13 ufs: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- fs/ufs/balloc.c | 4 ++-- fs/ufs/dir.c | 14 +++++++------- fs/ufs/inode.c | 2 +- fs/ufs/ufs.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-)
fs/ufs/balloc.c +2 -2
@@ -277,7 +277,7 @@ static void ufs_change_blocknr(struct inode *inode, sector_t beg,if (!page)/* it was truncated */ continue ;if (IS_ERR (page)) {/* or EIO */ -ufs_error (inode->i_sb, __FUNCTION__, +ufs_error (inode->i_sb, __func__,"read of page %llu failed\n" , (unsigned long long )index);continue ;
@@ -308,7 +308,7 @@ static void ufs_change_blocknr(struct inode *inode, sector_t beg,ll_rw_block (READ ,1 , &bh);wait_on_buffer (bh);if (!buffer_uptodate (bh)) { -ufs_error (inode->i_sb, __FUNCTION__, +ufs_error (inode->i_sb, __func__,"read of block failed\n" );break ; }
fs/ufs/dir.c +7 -7
@@ -179,7 +179,7 @@ bad_entry: goto fail; Eend: p = (struct ufs_dir_entry *)(kaddr + offs); -ufs_error (sb, __FUNCTION__, +ufs_error (sb, __func__,"entry in directory #%lu spans the page boundary" "offset=%lu" , dir->i_ino, (page->index<<PAGE_CACHE_SHIFT )+offs);
@@ -284,7 +284,7 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir, struct dentry *dentry, kaddr +=ufs_last_byte (dir, n) - reclen;while ((char *) de <= kaddr) {if (de->d_reclen ==0 ) { -ufs_error (dir->i_sb, __FUNCTION__, +ufs_error (dir->i_sb, __func__,"zero-length directory entry" );ufs_put_page (page); goto out;
@@ -356,7 +356,7 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode) goto got_it; }if (de->d_reclen ==0 ) { -ufs_error (dir->i_sb, __FUNCTION__, +ufs_error (dir->i_sb, __func__,"zero-length directory entry" ); err = -EIO ; goto out_unlock;
@@ -456,7 +456,7 @@ ufs_readdir(struct file *filp, void *dirent, filldir_t filldir)struct page *page =ufs_get_page (inode, n);if (IS_ERR (page)) { -ufs_error (sb, __FUNCTION__, +ufs_error (sb, __func__,"bad page in #%lu" , inode->i_ino); filp->f_pos +=PAGE_CACHE_SIZE - offset;
@@ -475,7 +475,7 @@ ufs_readdir(struct file *filp, void *dirent, filldir_t filldir) limit = kaddr +ufs_last_byte (inode, n) -UFS_DIR_REC_LEN (1 );for ( ;(char *)de <= limit; de =ufs_next_entry (sb, de)) {if (de->d_reclen ==0 ) { -ufs_error (sb, __FUNCTION__, +ufs_error (sb, __func__,"zero-length directory entry" );ufs_put_page (page);return -EIO ;
@@ -536,7 +536,7 @@ int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir,while ((char *)de < (char *)dir) {if (de->d_reclen ==0 ) { -ufs_error (inode->i_sb, __FUNCTION__, +ufs_error (inode->i_sb, __func__,"zero-length directory entry" ); err = -EIO ; goto out;
@@ -633,7 +633,7 @@ int ufs_empty_dir(struct inode * inode)while ((char *)de <= kaddr) {if (de->d_reclen ==0 ) { -ufs_error (inode->i_sb, __FUNCTION__, +ufs_error (inode->i_sb, __func__,"zero-length directory entry: " "kaddr=%p, de=%p\n" , kaddr, de); goto not_empty;
fs/ufs/inode.c +1 -1
@@ -929,7 +929,7 @@ void ufs_delete_inode (struct inode * inode) old_i_size = inode->i_size; inode->i_size =0 ;if (inode->i_blocks &&ufs_truncate (inode, old_i_size)) -ufs_warning (inode->i_sb, __FUNCTION__,"ufs_truncate failed\n" ); +ufs_warning (inode->i_sb, __func__,"ufs_truncate failed\n" );ufs_free_inode (inode);unlock_kernel ();return ;
fs/ufs/ufs.h +1 -1
@@ -66,7 +66,7 @@ struct ufs_inode_info {#ifdef CONFIG_UFS_DEBUG # define UFSD(f, a...) { \ printk ("UFSD (%s, %d): %s:", \ - __FILE__, __LINE__, __FUNCTION__); \ + __FILE__, __LINE__, __func__); \ printk (f, ## a); \ }#else
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 10/13 jbd: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- fs/jbd/journal.c | 18 +++++++++--------- fs/jbd/revoke.c | 2 +- fs/jbd/transaction.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)
fs/jbd/journal.c +9 -9
@@ -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 ;
@@ -727,7 +727,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;
@@ -781,7 +781,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 ; }
@@ -790,7 +790,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 ; }
@@ -876,7 +876,7 @@ int journal_create(journal_t *journal)*/ printk (KERN_EMERG "%s: creation of journal on external device!\n" , - __FUNCTION__); + __func__);BUG (); }
@@ -1656,7 +1656,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 ) {
@@ -1793,13 +1793,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 ;
fs/jbd/revoke.c +1 -1
@@ -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; }
fs/jbd/transaction.c +2 -2
@@ -681,7 +681,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);
@@ -891,7 +891,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; }
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 11/13 jdb2: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- fs/jbd2/journal.c | 18 +++++++++--------- fs/jbd2/revoke.c | 2 +- fs/jbd2/transaction.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)
fs/jbd2/journal.c +9 -9
@@ -534,7 +534,7 @@ int jbd2_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 jbd2_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 ;
@@ -1036,7 +1036,7 @@ journal_t * jbd2_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;
@@ -1092,7 +1092,7 @@ journal_t * jbd2_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 ; }
@@ -1101,7 +1101,7 @@ journal_t * jbd2_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 ; }
@@ -1187,7 +1187,7 @@ int jbd2_journal_create(journal_t *journal)*/ printk (KERN_EMERG "%s: creation of journal on external device!\n" , - __FUNCTION__); + __func__);BUG (); }
@@ -2006,7 +2006,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 ==0 ) {
@@ -2143,13 +2143,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__);jbd2_free (jh->b_frozen_data, bh->b_size); }if (jh->b_committed_data) {printk (KERN_WARNING "%s: freeing " "b_committed_data\n" , - __FUNCTION__); + __func__);jbd2_free (jh->b_committed_data, bh->b_size); } bh->b_private =NULL ;
fs/jbd2/revoke.c +1 -1
@@ -139,7 +139,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; }
fs/jbd2/transaction.c +2 -2
@@ -690,7 +690,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);
@@ -901,7 +901,7 @@ repeat: committed_data =jbd2_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; }
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 12/13 afs: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
--- fs/afs/dir.c | 4 ++-- fs/afs/internal.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
fs/afs/dir.c +2 -2
@@ -140,7 +140,7 @@ static inline void afs_dir_check_page(struct inode *dir, struct page *page)if (page->index ==0 && qty !=ntohs (dbuf->blocks[0 ].pagehdr.npages)) {printk ("kAFS: %s(%lu): wrong number of dir blocks %d!=%hu\n" , - __FUNCTION__, dir->i_ino, qty, + __func__, dir->i_ino, qty,ntohs (dbuf->blocks[0 ].pagehdr.npages)); goto error; }
@@ -159,7 +159,7 @@ static inline void afs_dir_check_page(struct inode *dir, struct page *page)for (tmp =0 ; tmp < qty; tmp++) {if (dbuf->blocks[tmp].pagehdr.magic !=AFS_DIR_MAGIC ) {printk ("kAFS: %s(%lu): bad magic %d/%d is %04hx\n" , - __FUNCTION__, dir->i_ino, tmp, qty, + __func__, dir->i_ino, tmp, qty,ntohs (dbuf->blocks[tmp].pagehdr.magic)); goto error; }
fs/afs/internal.h +4 -4
@@ -758,8 +758,8 @@ void _dbprintk(const char *fmt, ...) { } -#define kenter (FMT ,...) dbgprintk("==> %s("FMT")",__FUNCTION__ ,##__VA_ARGS__) -#define kleave (FMT ,...) dbgprintk("<== %s()"FMT"",__FUNCTION__ ,##__VA_ARGS__) +#define kenter (FMT ,...) dbgprintk("==> %s("FMT")",__func__ ,##__VA_ARGS__) +#define kleave (FMT ,...) dbgprintk("<== %s()"FMT"",__func__ ,##__VA_ARGS__)#define kdebug (FMT ,...) dbgprintk(" "FMT ,##__VA_ARGS__)
@@ -792,8 +792,8 @@ do { \ } while (0)#else -#define _enter (FMT ,...) _dbprintk("==> %s("FMT")",__FUNCTION__ ,##__VA_ARGS__) -#define _leave (FMT ,...) _dbprintk("<== %s()"FMT"",__FUNCTION__ ,##__VA_ARGS__) +#define _enter (FMT ,...) _dbprintk("==> %s("FMT")",__func__ ,##__VA_ARGS__) +#define _leave (FMT ,...) _dbprintk("<== %s()"FMT"",__func__ ,##__VA_ARGS__)#define _debug (FMT ,...) _dbprintk(" "FMT ,##__VA_ARGS__)#endif
Signature · 1 line
1.5.4.3.500.g83a2c
PATCH 13/13 fs: replace remaining __FUNCTION__ occurrences
In reply to a message not in the archive__FUNCTION__ is gcc-specific, use __func__
Signed-off-by Harvey Harrison <[email protected]>
---
Andrew, if you want this broken out, let me know.
fs/adfs/adfs.h | 2 +- fs/autofs4/autofs_i.h | 2 +- fs/bfs/bfs.h | 2 +- fs/buffer.c | 2 +- fs/configfs/file.c | 2 +- fs/configfs/mount.c | 2 +- fs/configfs/symlink.c | 4 ++-- fs/dlm/lockspace.c | 2 +- fs/exportfs/expfs.c | 10 +++++----- fs/fat/cache.c | 6 +++--- fs/fat/fatent.c | 2 +- fs/fat/file.c | 2 +- fs/gfs2/locking/dlm/sysfs.c | 2 +- fs/gfs2/util.h | 18 +++++++++--------- fs/jffs2/debug.h | 8 ++++---- fs/jffs2/xattr.c | 4 ++-- fs/lockd/clntproc.c | 2 +- fs/lockd/svclock.c | 2 +- fs/msdos/namei.c | 2 +- fs/namespace.c | 4 ++-- fs/nfsd/nfs4callback.c | 4 ++-- fs/ntfs/debug.h | 6 +++--- fs/partitions/ldm.c | 8 ++++---- fs/smbfs/smb_debug.h | 6 +++--- fs/sysfs/file.c | 2 +- fs/sysfs/mount.c | 2 +- fs/udf/super.c | 4 ++-- fs/vfat/namei.c | 2 +- 28 files changed, 57 insertions(+), 57 deletions(-)
fs/adfs/adfs.h +1 -1
@@ -75,7 +75,7 @@ extern unsigned int adfs_map_free(struct super_block *sb);/* Misc */ void __adfs_error (struct super_block *sb,const char *function,const char *fmt, ...); -#define adfs_error(sb, fmt...) __adfs_error(sb, __FUNCTION__, fmt) +#define adfs_error(sb, fmt...) __adfs_error(sb, __func__, fmt)/* super.c */
fs/autofs4/autofs_i.h +1 -1
@@ -35,7 +35,7 @@/* #define DEBUG */ #ifdef DEBUG -#define DPRINTK(fmt,args...) do { printk(KERN_DEBUG "pid %d: %s: " fmt "\n" , current->pid , __FUNCTION__ , ##args); } while(0) +#define DPRINTK(fmt,args...) do { printk(KERN_DEBUG "pid %d: %s: " fmt "\n" , current->pid , __func__ , ##args); } while(0)#else #define DPRINTK(fmt,args...) do {} while(0)#endif
fs/bfs/bfs.h +1 -1
@@ -42,7 +42,7 @@ static inline struct bfs_inode_info *BFS_I(struct inode *inode) #define printf(format, args...) \ - printk(KERN_ERR "BFS-fs: %s(): " format, __FUNCTION__, ## args) + printk(KERN_ERR "BFS-fs: %s(): " format, __func__, ## args)/* inode.c */ extern struct inode *bfs_iget (struct super_block *sb,unsigned long ino);
fs/buffer.c +1 -1
@@ -1098,7 +1098,7 @@ grow_buffers(struct block_device *bdev, sector_t block, int size)printk (KERN_ERR "%s: requested out-of-range block %llu for " "device %s\n" , - __FUNCTION__, (unsigned long long )block, + __func__, (unsigned long long )block,bdevname (bdev, b));return -EIO ; }
fs/configfs/file.c +1 -1
@@ -115,7 +115,7 @@ configfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *pp goto out; }pr_debug ("%s: count = %zd, ppos = %lld, buf = %s\n" , - __FUNCTION__, count, *ppos, buffer->page); + __func__, count, *ppos, buffer->page); retval =simple_read_from_buffer (buf, count, ppos, buffer->page, buffer->count); out:
fs/configfs/mount.c +1 -1
@@ -92,7 +92,7 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent) root =d_alloc_root (inode);if (!root) { -pr_debug ("%s: could not get root dentry!\n" ,__FUNCTION__); +pr_debug ("%s: could not get root dentry!\n" ,__func__);iput (inode);return -ENOMEM ; }
fs/configfs/symlink.c +2 -2
@@ -210,13 +210,13 @@ static int configfs_get_target_path(struct config_item * item, struct config_iteif (size >PATH_MAX )return -ENAMETOOLONG ; -pr_debug ("%s: depth = %d, size = %d\n" , __FUNCTION__, depth, size); +pr_debug ("%s: depth = %d, size = %d\n" , __func__, depth, size);for (s = path; depth--; s +=3 )strcpy (s,"../" );fill_item_path (target, path, size); -pr_debug ("%s: path = '%s'\n" , __FUNCTION__, path); +pr_debug ("%s: path = '%s'\n" , __func__, path);return 0 ; }
fs/dlm/lockspace.c +1 -1
@@ -200,7 +200,7 @@ int __init dlm_lockspace_init(void) dlm_kset =kset_create_and_add ("dlm" ,NULL , kernel_kobj);if (!dlm_kset) { -printk (KERN_WARNING "%s: can not create kset\n" , __FUNCTION__); +printk (KERN_WARNING "%s: can not create kset\n" , __func__);return -ENOMEM ; }return 0 ;
fs/exportfs/expfs.c +5 -5
@@ -150,12 +150,12 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir)if (IS_ERR (ppd)) { err =PTR_ERR (ppd);dprintk ("%s: get_parent of %ld failed, err %d\n" , - __FUNCTION__, pd->d_inode->i_ino, err); + __func__, pd->d_inode->i_ino, err);dput (pd);break ; } -dprintk ("%s: find name of %lu in %lu\n" , __FUNCTION__, +dprintk ("%s: find name of %lu in %lu\n" , __func__, pd->d_inode->i_ino, ppd->d_inode->i_ino); err =exportfs_get_name (mnt, ppd, nbuf, pd);if (err) {
@@ -168,14 +168,14 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir)continue ;break ; } -dprintk ("%s: found name: %s\n" , __FUNCTION__, nbuf); +dprintk ("%s: found name: %s\n" , __func__, nbuf);mutex_lock (&ppd->d_inode->i_mutex); npd =lookup_one_len (nbuf, ppd,strlen (nbuf));mutex_unlock (&ppd->d_inode->i_mutex);if (IS_ERR (npd)) { err =PTR_ERR (npd);dprintk ("%s: lookup failed: %d\n" , - __FUNCTION__, err); + __func__, err);dput (ppd);dput (pd);break ;
@@ -188,7 +188,7 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir)if (npd == pd) noprogress =0 ;else -printk ("%s: npd != pd\n" , __FUNCTION__); +printk ("%s: npd != pd\n" , __func__);dput (npd);dput (ppd);if (IS_ROOT (pd)) {
fs/fat/cache.c +3 -3
@@ -242,7 +242,7 @@ int fat_get_cluster(struct inode *inode, int cluster, int *fclus, int *dclus)/* prevent the infinite loop of cluster chain */ if (*fclus > limit) {fat_fs_panic (sb,"%s: detected the cluster chain loop" -" (i_pos %lld)" , __FUNCTION__, +" (i_pos %lld)" , __func__,MSDOS_I (inode)->i_pos); nr = -EIO ; goto out;
@@ -253,7 +253,7 @@ int fat_get_cluster(struct inode *inode, int cluster, int *fclus, int *dclus) goto out; else if (nr == FAT_ENT_FREE) {fat_fs_panic (sb,"%s: invalid cluster chain" -" (i_pos %lld)" , __FUNCTION__, +" (i_pos %lld)" , __func__,MSDOS_I (inode)->i_pos); nr = -EIO ; goto out;
@@ -286,7 +286,7 @@ static int fat_bmap_cluster(struct inode *inode, int cluster)return ret; else if (ret == FAT_ENT_EOF) {fat_fs_panic (sb,"%s: request beyond EOF (i_pos %lld)" , - __FUNCTION__,MSDOS_I (inode)->i_pos); + __func__,MSDOS_I (inode)->i_pos);return -EIO ; }return dclus;
fs/fat/fatent.c +1 -1
@@ -544,7 +544,7 @@ int fat_free_clusters(struct inode *inode, int cluster) goto error; }else if (cluster ==FAT_ENT_FREE ) {fat_fs_panic (sb,"%s: deleting FAT entry beyond EOF" , - __FUNCTION__); + __func__); err = -EIO ; goto error; }
fs/fat/file.c +1 -1
@@ -304,7 +304,7 @@ static int fat_free(struct inode *inode, int skip) }else if (ret ==FAT_ENT_FREE ) {fat_fs_panic (sb,"%s: invalid cluster chain (i_pos %lld)" , - __FUNCTION__,MSDOS_I (inode)->i_pos); + __func__,MSDOS_I (inode)->i_pos); ret = -EIO ; }else if (ret >0 ) { err =fat_ent_write (inode, &fatent,FAT_ENT_EOF , wait);
fs/gfs2/locking/dlm/sysfs.c +1 -1
@@ -214,7 +214,7 @@ int gdlm_sysfs_init(void) { gdlm_kset =kset_create_and_add ("lock_dlm" ,NULL , kernel_kobj);if (!gdlm_kset) { -printk (KERN_WARNING "%s: can not create kset\n" , __FUNCTION__); +printk (KERN_WARNING "%s: can not create kset\n" , __func__);return -ENOMEM ; }return 0 ;
fs/gfs2/util.h +9 -9
@@ -41,7 +41,7 @@ int gfs2_assert_withdraw_i(struct gfs2_sbd *sdp, char *assertion,#define gfs2_assert_withdraw (sdp, assertion) \ ((likely(assertion)) ? 0 : gfs2_assert_withdraw_i((sdp), #assertion, \ - __FUNCTION__, __FILE__, __LINE__)) + __func__, __FILE__, __LINE__)) int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,
@@ -49,28 +49,28 @@ int gfs2_assert_warn_i(struct gfs2_sbd *sdp, char *assertion,#define gfs2_assert_warn (sdp, assertion) \ ((likely(assertion)) ? 0 : gfs2_assert_warn_i((sdp), #assertion, \ - __FUNCTION__, __FILE__, __LINE__)) + __func__, __FILE__, __LINE__))int gfs2_consist_i (struct gfs2_sbd *sdp,int cluster_wide,const char *function,char *file,unsigned int line);#define gfs2_consist (sdp) \ -gfs2_consist_i((sdp), 0, __FUNCTION__, __FILE__, __LINE__) +gfs2_consist_i((sdp), 0, __func__, __FILE__, __LINE__)int gfs2_consist_inode_i (struct gfs2_inode *ip,int cluster_wide,const char *function,char *file,unsigned int line);#define gfs2_consist_inode (ip) \ -gfs2_consist_inode_i((ip), 0, __FUNCTION__, __FILE__, __LINE__) +gfs2_consist_inode_i((ip), 0, __func__, __FILE__, __LINE__)int gfs2_consist_rgrpd_i (struct gfs2_rgrpd *rgd,int cluster_wide,const char *function,char *file,unsigned int line);#define gfs2_consist_rgrpd (rgd) \ -gfs2_consist_rgrpd_i((rgd), 0, __FUNCTION__, __FILE__, __LINE__) +gfs2_consist_rgrpd_i((rgd), 0, __func__, __FILE__, __LINE__) int gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,
@@ -91,7 +91,7 @@ static inline int gfs2_meta_check_i(struct gfs2_sbd *sdp, }#define gfs2_meta_check (sdp, bh) \ -gfs2_meta_check_i((sdp), (bh), __FUNCTION__, __FILE__, __LINE__) +gfs2_meta_check_i((sdp), (bh), __func__, __FILE__, __LINE__) int gfs2_metatype_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,
@@ -118,7 +118,7 @@ static inline int gfs2_metatype_check_i(struct gfs2_sbd *sdp, }#define gfs2_metatype_check (sdp, bh, type) \ -gfs2_metatype_check_i((sdp), (bh), (type), __FUNCTION__, __FILE__, __LINE__) +gfs2_metatype_check_i((sdp), (bh), (type), __func__, __FILE__, __LINE__)static inline void gfs2_metatype_set (struct buffer_head *bh,u16 type,u16 format)
@@ -134,14 +134,14 @@ int gfs2_io_error_i(struct gfs2_sbd *sdp, const char *function, char *file, unsigned int line);#define gfs2_io_error (sdp) \ -gfs2_io_error_i((sdp), __FUNCTION__, __FILE__, __LINE__); +gfs2_io_error_i((sdp), __func__, __FILE__, __LINE__);int gfs2_io_error_bh_i (struct gfs2_sbd *sdp,struct buffer_head *bh,const char *function,char *file,unsigned int line);#define gfs2_io_error_bh (sdp, bh) \ -gfs2_io_error_bh_i((sdp), (bh), __FUNCTION__, __FILE__, __LINE__); +gfs2_io_error_bh_i((sdp), (bh), __func__, __FILE__, __LINE__);extern struct kmem_cache *gfs2_glock_cachep;
fs/jffs2/debug.h +4 -4
@@ -81,28 +81,28 @@do { \printk (JFFS2_ERR_MSG_PREFIX \" (%d) %s: " fmt,task_pid_nr (current), \ - __FUNCTION__ , ##__VA_ARGS__); \ + __func__ , ##__VA_ARGS__); \ } while(0)#define JFFS2_WARNING (fmt, ...) \ do { \ printk(JFFS2_WARN_MSG_PREFIX \ " (%d) %s: " fmt, task_pid_nr(current), \ - __FUNCTION__ , ##__VA_ARGS__); \ + __func__ , ##__VA_ARGS__); \ } while(0)#define JFFS2_NOTICE (fmt, ...) \ do { \ printk(JFFS2_NOTICE_MSG_PREFIX \ " (%d) %s: " fmt, task_pid_nr(current), \ - __FUNCTION__ , ##__VA_ARGS__); \ + __func__ , ##__VA_ARGS__); \ } while(0)#define JFFS2_DEBUG (fmt, ...) \ do { \ printk(JFFS2_DBG_MSG_PREFIX \ " (%d) %s: " fmt, task_pid_nr(current), \ - __FUNCTION__ , ##__VA_ARGS__); \ + __func__ , ##__VA_ARGS__); \ } while(0)/*
fs/jffs2/xattr.c +2 -2
@@ -82,7 +82,7 @@ static int is_xattr_datum_unchecked(struct jffs2_sb_info *c, struct jffs2_xattr_static void unload_xattr_datum (struct jffs2_sb_info *c,struct jffs2_xattr_datum *xd) {/* must be called under down_write(xattr_sem) */ -D1 (dbg_xattr ("%s: xid=%u, version=%u\n" , __FUNCTION__, xd->xid, xd->version)); +D1 (dbg_xattr ("%s: xid=%u, version=%u\n" , __func__, xd->xid, xd->version));if (xd->xname) { c->xdatum_mem_usage -= (xd->name_len +1 + xd->value_len);kfree (xd->xname);
@@ -1252,7 +1252,7 @@ int jffs2_garbage_collect_xattr_ref(struct jffs2_sb_info *c, struct jffs2_xattr_ rc =jffs2_reserve_space_gc (c, totlen, &length,JFFS2_SUMMARY_XREF_SIZE );if (rc) {JFFS2_WARNING ("%s: jffs2_reserve_space_gc() = %d, request = %u\n" , - __FUNCTION__, rc, totlen); + __func__, rc, totlen); rc = rc ? rc : -EBADFD ; goto out; }
fs/lockd/clntproc.c +1 -1
@@ -532,7 +532,7 @@ again:/* Ensure the resulting lock will get added to granted list */ fl->fl_flags = fl_flags |FL_SLEEP ;if (do_vfs_lock (fl) <0 ) -printk (KERN_WARNING "%s: VFS is out of sync with lock manager!\n" , __FUNCTION__); +printk (KERN_WARNING "%s: VFS is out of sync with lock manager!\n" , __func__);up_read (&host->h_rwsem); } status =nlm_stat_to_errno (resp->status);
fs/lockd/svclock.c +1 -1
@@ -752,7 +752,7 @@ nlmsvc_grant_blocked(struct nlm_block *block)return ;default :printk (KERN_WARNING "lockd: unexpected error %d in %s!\n" , - -error, __FUNCTION__); + -error, __func__);nlmsvc_insert_block (block,10 *HZ );nlmsvc_release_block (block);return ;
fs/msdos/namei.c +1 -1
@@ -609,7 +609,7 @@ error_inode:if (corrupt <0 ) {fat_fs_panic (new_dir->i_sb,"%s: Filesystem corrupted (i_pos %lld)" , - __FUNCTION__, sinfo.i_pos); + __func__, sinfo.i_pos); } goto out; }
fs/namespace.c +2 -2
@@ -1892,10 +1892,10 @@ void __init mnt_init(void) err =sysfs_init ();if (err)printk (KERN_WARNING "%s: sysfs_init error: %d\n" , - __FUNCTION__, err); + __func__, err); fs_kobj =kobject_create_and_add ("fs" ,NULL );if (!fs_kobj) -printk (KERN_WARNING "%s: kobj create error\n" , __FUNCTION__); +printk (KERN_WARNING "%s: kobj create error\n" , __func__);init_rootfs ();init_mount_tree (); }
fs/nfsd/nfs4callback.c +2 -2
@@ -104,7 +104,7 @@ xdr_writemem(__be32 *p, const void *ptr, int nbytes) } while (0)#define RESERVE_SPACE (nbytes) do { \ p = xdr_reserve_space(xdr, nbytes); \ - if (!p) dprintk("NFSD: RESERVE_SPACE(%d) failed in function %s\n", (int) (nbytes), __FUNCTION__); \ + if (!p) dprintk("NFSD: RESERVE_SPACE(%d) failed in function %s\n", (int) (nbytes), __func__); \ BUG_ON(!p); \ } while (0)
@@ -134,7 +134,7 @@ xdr_error: \ p =xdr_inline_decode (xdr, nbytes); \if (!p) { \dprintk ("NFSD: %s: reply buffer overflowed in line %d.\n" , \ - __FUNCTION__, __LINE__); \ + __func__, __LINE__); \return -EIO ; \ } \ }while (0 )
fs/ntfs/debug.h +3 -3
@@ -45,7 +45,7 @@ static void ntfs_debug(const char *f, ...);extern void __ntfs_debug (const char *file,int line,const char *function,const char *format, ...) __attribute__ ((format (printf,4 ,5 ))); #define ntfs_debug(f, a...) \ - __ntfs_debug(__FILE__, __LINE__, __FUNCTION__, f, ##a) + __ntfs_debug(__FILE__, __LINE__, __func__, f, ##a)extern void ntfs_debug_dump_runlist (const runlist_element *rl);
@@ -58,10 +58,10 @@ extern void ntfs_debug_dump_runlist(const runlist_element *rl);extern void __ntfs_warning (const char *function,const struct super_block *sb,const char *fmt, ...) __attribute__ ((format (printf,3 ,4 ))); -#define ntfs_warning(sb, f, a...) __ntfs_warning(__FUNCTION__, sb, f, ##a) +#define ntfs_warning(sb, f, a...) __ntfs_warning(__func__, sb, f, ##a)extern void __ntfs_error (const char *function,const struct super_block *sb,const char *fmt, ...) __attribute__ ((format (printf,3 ,4 ))); -#define ntfs_error(sb, f, a...) __ntfs_error(__FUNCTION__, sb, f, ##a) +#define ntfs_error(sb, f, a...) __ntfs_error(__func__, sb, f, ##a)#endif /* _LINUX_NTFS_DEBUG_H */
fs/partitions/ldm.c +4 -4
@@ -41,12 +41,12 @@#ifndef CONFIG_LDM_DEBUG #define ldm_debug (...) do {} while (0)#else -#define ldm_debug(f, a...) _ldm_printk (KERN_DEBUG, __FUNCTION__, f, ##a) +#define ldm_debug(f, a...) _ldm_printk (KERN_DEBUG, __func__, f, ##a)#endif -#define ldm_crit(f, a...) _ldm_printk (KERN_CRIT, __FUNCTION__, f, ##a) -#define ldm_error(f, a...) _ldm_printk (KERN_ERR, __FUNCTION__, f, ##a) -#define ldm_info(f, a...) _ldm_printk (KERN_INFO, __FUNCTION__, f, ##a) +#define ldm_crit(f, a...) _ldm_printk (KERN_CRIT, __func__, f, ##a) +#define ldm_error(f, a...) _ldm_printk (KERN_ERR, __func__, f, ##a) +#define ldm_info(f, a...) _ldm_printk (KERN_INFO, __func__, f, ##a) __attribute__ ((format (printf, 3, 4))) static void _ldm_printk (const char *level, const char *function,
fs/smbfs/smb_debug.h +3 -3
@@ -11,14 +11,14 @@* these are normally enabled. */ #ifdef SMBFS_PARANOIA -# define PARANOIA(f, a...) printk(KERN_NOTICE "%s: " f, __FUNCTION__ , ## a) +# define PARANOIA(f, a...) printk(KERN_NOTICE "%s: " f, __func__ , ## a)#else # define PARANOIA(f, a...) do { ; } while(0)#endif /* lots of debug messages */ #ifdef SMBFS_DEBUG_VERBOSE -# define VERBOSE(f, a...) printk(KERN_DEBUG "%s: " f, __FUNCTION__ , ## a) +# define VERBOSE(f, a...) printk(KERN_DEBUG "%s: " f, __func__ , ## a)#else # define VERBOSE(f, a...) do { ; } while(0)#endif
@@ -28,7 +28,7 @@* too common name. */ #ifdef SMBFS_DEBUG -#define DEBUG1(f, a...) printk(KERN_DEBUG "%s: " f, __FUNCTION__ , ## a) +#define DEBUG1(f, a...) printk(KERN_DEBUG "%s: " f, __func__ , ## a)#else #define DEBUG1(f, a...) do { ; } while(0)#endif
fs/sysfs/file.c +1 -1
@@ -128,7 +128,7 @@ sysfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *ppos) goto out; }pr_debug ("%s: count = %zd, ppos = %lld, buf = %s\n" , - __FUNCTION__, count, *ppos, buffer->page); + __func__, count, *ppos, buffer->page); retval =simple_read_from_buffer (buf, count, ppos, buffer->page, buffer->count); out:
fs/sysfs/mount.c +1 -1
@@ -61,7 +61,7 @@ static int sysfs_fill_super(struct super_block *sb, void *data, int silent)/* instantiate and link root dentry */ root =d_alloc_root (inode);if (!root) { -pr_debug ("%s: could not get root dentry!\n" ,__FUNCTION__); +pr_debug ("%s: could not get root dentry!\n" ,__func__);iput (inode);return -ENOMEM ; }
fs/udf/super.c +2 -2
@@ -242,7 +242,7 @@ static int udf_sb_alloc_partition_maps(struct super_block *sb, u32 count) sbi->s_partmaps =kcalloc (count,sizeof (struct udf_part_map ),GFP_KERNEL );if (!sbi->s_partmaps) { -udf_error (sb, __FUNCTION__, +udf_error (sb, __func__,"Unable to allocate space for %d partition maps" , count); sbi->s_partitions =0 ;
@@ -1047,7 +1047,7 @@ static struct udf_bitmap *udf_sb_alloc_bitmap(struct super_block *sb, u32 index) bitmap =vmalloc (size);/* TODO: get rid of vmalloc */ if (bitmap ==NULL ) { -udf_error (sb, __FUNCTION__, +udf_error (sb, __func__,"Unable to allocate space for bitmap " "and %d buffer_head pointers" , nr_groups);return NULL ;
fs/vfat/namei.c +1 -1
@@ -991,7 +991,7 @@ error_inode:if (corrupt <0 ) {fat_fs_panic (new_dir->i_sb,"%s: Filesystem corrupted (i_pos %lld)" , - __FUNCTION__, sinfo.i_pos); + __func__, sinfo.i_pos); } goto out; }
Signature · 1 line
1.5.4.3.500.g83a2c