lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ext2: replace remaining __FUNCTION__ occurrences

Browse Source 
__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Harvey Harrison
2008-04-28 02:16:03 -07:00
committed by Linus Torvalds
parent 2c11619a59
commit 605afd60ef
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fs/ext2/balloc.c
View File

@@ -106,7 +106,7 @@ static int ext2_valid_block_bitmap(struct super_block *sb,
return 1; return 1;
err_out: err_out:
ext2_error(sb, __FUNCTION__, ext2_error(sb, __func__,
"Invalid block bitmap - " "Invalid block bitmap - "
"block_group = %d, block = %lu", "block_group = %d, block = %lu",
block_group, bitmap_blk); block_group, bitmap_blk);
@@ -132,7 +132,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
bitmap_blk = le32_to_cpu(desc->bg_block_bitmap); bitmap_blk = le32_to_cpu(desc->bg_block_bitmap);
bh = sb_getblk(sb, bitmap_blk); bh = sb_getblk(sb, bitmap_blk);
if (unlikely(!bh)) { if (unlikely(!bh)) {
ext2_error(sb, __FUNCTION__, ext2_error(sb, __func__,
"Cannot read block bitmap - " "Cannot read block bitmap - "
"block_group = %d, block_bitmap = %u", "block_group = %d, block_bitmap = %u",
block_group, le32_to_cpu(desc->bg_block_bitmap)); block_group, le32_to_cpu(desc->bg_block_bitmap));
@@ -143,7 +143,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group)
if (bh_submit_read(bh) < 0) { if (bh_submit_read(bh) < 0) {
brelse(bh); brelse(bh);
ext2_error(sb, __FUNCTION__, ext2_error(sb, __func__,
"Cannot read block bitmap - " "Cannot read block bitmap - "
"block_group = %d, block_bitmap = %u", "block_group = %d, block_bitmap = %u",
block_group, le32_to_cpu(desc->bg_block_bitmap)); block_group, le32_to_cpu(desc->bg_block_bitmap));
@@ -248,7 +248,7 @@ restart:
BUG_ON(bad); BUG_ON(bad);
} }
#define rsv_window_dump(root, verbose) \ #define rsv_window_dump(root, verbose) \
__rsv_window_dump((root), (verbose), __FUNCTION__) __rsv_window_dump((root), (verbose), __func__)
#else #else
#define rsv_window_dump(root, verbose) do {} while (0) #define rsv_window_dump(root, verbose) do {} while (0)
#endif #endif
@@ -547,7 +547,7 @@ do_more:
for (i = 0, group_freed = 0; i < count; i++) { for (i = 0, group_freed = 0; i < count; i++) {
if (!ext2_clear_bit_atomic(sb_bgl_lock(sbi, block_group), if (!ext2_clear_bit_atomic(sb_bgl_lock(sbi, block_group),
bit + i, bitmap_bh->b_data)) { bit + i, bitmap_bh->b_data)) {
ext2_error(sb, __FUNCTION__, ext2_error(sb, __func__,
"bit already cleared for block %lu", block + i); "bit already cleared for block %lu", block + i);
} else { } else {
group_freed++; group_freed++;

14
fs/ext2/dir.c
View File

@@ -295,7 +295,7 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
struct page *page = ext2_get_page(inode, n); struct page *page = ext2_get_page(inode, n);
if (IS_ERR(page)) { if (IS_ERR(page)) {
ext2_error(sb, __FUNCTION__, ext2_error(sb, __func__,
"bad page in #%lu", "bad page in #%lu",
inode->i_ino); inode->i_ino);
filp->f_pos += PAGE_CACHE_SIZE - offset; filp->f_pos += PAGE_CACHE_SIZE - offset;
@@ -314,7 +314,7 @@ ext2_readdir (struct file * filp, void * dirent, filldir_t filldir)
limit = kaddr + ext2_last_byte(inode, n) - EXT2_DIR_REC_LEN(1); limit = kaddr + ext2_last_byte(inode, n) - EXT2_DIR_REC_LEN(1);
for ( ;(char*)de <= limit; de = ext2_next_entry(de)) { for ( ;(char*)de <= limit; de = ext2_next_entry(de)) {
if (de->rec_len == 0) { if (de->rec_len == 0) {
ext2_error(sb, __FUNCTION__, ext2_error(sb, __func__,
"zero-length directory entry"); "zero-length directory entry");
ext2_put_page(page); ext2_put_page(page);
return -EIO; return -EIO;
@@ -381,7 +381,7 @@ struct ext2_dir_entry_2 * ext2_find_entry (struct inode * dir,
kaddr += ext2_last_byte(dir, n) - reclen; kaddr += ext2_last_byte(dir, n) - reclen;
while ((char *) de <= kaddr) { while ((char *) de <= kaddr) {
if (de->rec_len == 0) { if (de->rec_len == 0) {
ext2_error(dir->i_sb, __FUNCTION__, ext2_error(dir->i_sb, __func__,
"zero-length directory entry"); "zero-length directory entry");
ext2_put_page(page); ext2_put_page(page);
goto out; goto out;
@@ -396,7 +396,7 @@ struct ext2_dir_entry_2 * ext2_find_entry (struct inode * dir,
n = 0; n = 0;
/* next page is past the blocks we've got */ /* next page is past the blocks we've got */
if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) { if (unlikely(n > (dir->i_blocks >> (PAGE_CACHE_SHIFT - 9)))) {
ext2_error(dir->i_sb, __FUNCTION__, ext2_error(dir->i_sb, __func__,
"dir %lu size %lld exceeds block count %llu", "dir %lu size %lld exceeds block count %llu",
dir->i_ino, dir->i_size, dir->i_ino, dir->i_size,
(unsigned long long)dir->i_blocks); (unsigned long long)dir->i_blocks);
@@ -506,7 +506,7 @@ int ext2_add_link (struct dentry *dentry, struct inode *inode)
goto got_it; goto got_it;
} }
if (de->rec_len == 0) { if (de->rec_len == 0) {
ext2_error(dir->i_sb, __FUNCTION__, ext2_error(dir->i_sb, __func__,
"zero-length directory entry"); "zero-length directory entry");
err = -EIO; err = -EIO;
goto out_unlock; goto out_unlock;
@@ -578,7 +578,7 @@ int ext2_delete_entry (struct ext2_dir_entry_2 * dir, struct page * page )
while ((char*)de < (char*)dir) { while ((char*)de < (char*)dir) {
if (de->rec_len == 0) { if (de->rec_len == 0) {
ext2_error(inode->i_sb, __FUNCTION__, ext2_error(inode->i_sb, __func__,
"zero-length directory entry"); "zero-length directory entry");
err = -EIO; err = -EIO;
goto out; goto out;
@@ -670,7 +670,7 @@ int ext2_empty_dir (struct inode * inode)
while ((char *)de <= kaddr) { while ((char *)de <= kaddr) {
if (de->rec_len == 0) { if (de->rec_len == 0) {
ext2_error(inode->i_sb, __FUNCTION__, ext2_error(inode->i_sb, __func__,
"zero-length directory entry"); "zero-length directory entry");
printk("kaddr=%p, de=%p\n", kaddr, de); printk("kaddr=%p, de=%p\n", kaddr, de);
goto not_empty; goto not_empty;

6
fs/ext2/super.c
View File

@@ -89,7 +89,7 @@ void ext2_update_dynamic_rev(struct super_block *sb)
if (le32_to_cpu(es->s_rev_level) > EXT2_GOOD_OLD_REV) if (le32_to_cpu(es->s_rev_level) > EXT2_GOOD_OLD_REV)
return; return;
ext2_warning(sb, __FUNCTION__, ext2_warning(sb, __func__,
"updating to rev %d because of new feature flag, " "updating to rev %d because of new feature flag, "
"running e2fsck is recommended", "running e2fsck is recommended",
EXT2_DYNAMIC_REV); EXT2_DYNAMIC_REV);
@@ -1060,7 +1060,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
goto failed_mount3; goto failed_mount3;
} }
if (EXT2_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) if (EXT2_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL))
ext2_warning(sb, __FUNCTION__, ext2_warning(sb, __func__,
"mounting ext3 filesystem as ext2"); "mounting ext3 filesystem as ext2");
ext2_setup_super (sb, es, sb->s_flags & MS_RDONLY); ext2_setup_super (sb, es, sb->s_flags & MS_RDONLY);
return 0; return 0;
@@ -1177,7 +1177,7 @@ static int ext2_remount (struct super_block * sb, int * flags, char * data)
if (((sbi->s_mount_opt & EXT2_MOUNT_XIP) != if (((sbi->s_mount_opt & EXT2_MOUNT_XIP) !=
(old_mount_opt & EXT2_MOUNT_XIP)) && (old_mount_opt & EXT2_MOUNT_XIP)) &&
invalidate_inodes(sb)) invalidate_inodes(sb))
ext2_warning(sb, __FUNCTION__, "busy inodes while remounting "\ ext2_warning(sb, __func__, "busy inodes while remounting "\
"xip remain in cache (no functional problem)"); "xip remain in cache (no functional problem)");
if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
return 0; return 0;

2
fs/ext2/xip.c
View File

@@ -68,7 +68,7 @@ void ext2_xip_verify_sb(struct super_block *sb)
if ((sbi->s_mount_opt & EXT2_MOUNT_XIP) && if ((sbi->s_mount_opt & EXT2_MOUNT_XIP) &&
!sb->s_bdev->bd_disk->fops->direct_access) { !sb->s_bdev->bd_disk->fops->direct_access) {
sbi->s_mount_opt &= (~EXT2_MOUNT_XIP); sbi->s_mount_opt &= (~EXT2_MOUNT_XIP);
ext2_warning(sb, __FUNCTION__, ext2_warning(sb, __func__,
"ignoring xip option - not supported by bdev"); "ignoring xip option - not supported by bdev");
} }
} }