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

ufs: replace remaining __FUNCTION__ occurrences

Browse Source 
__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Jan Engelhardt <jengelh@linux01.gwdg.de>
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:17 -07:00
committed by Linus Torvalds
parent 3c5afae2ba
commit 9746077a71
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ufs/balloc.c
View File

@@ -277,7 +277,7 @@ static void ufs_change_blocknr(struct inode *inode, sector_t beg,
if (!page)/* it was truncated */ if (!page)/* it was truncated */
continue; continue;
if (IS_ERR(page)) {/* or EIO */ if (IS_ERR(page)) {/* or EIO */
ufs_error(inode->i_sb, __FUNCTION__, ufs_error(inode->i_sb, __func__,
"read of page %llu failed\n", "read of page %llu failed\n",
(unsigned long long)index); (unsigned long long)index);
continue; continue;
@@ -308,7 +308,7 @@ static void ufs_change_blocknr(struct inode *inode, sector_t beg,
ll_rw_block(READ, 1, &bh); ll_rw_block(READ, 1, &bh);
wait_on_buffer(bh); wait_on_buffer(bh);
if (!buffer_uptodate(bh)) { if (!buffer_uptodate(bh)) {
ufs_error(inode->i_sb, __FUNCTION__, ufs_error(inode->i_sb, __func__,
"read of block failed\n"); "read of block failed\n");
break; break;
} }

14
fs/ufs/dir.c
View File

@@ -179,7 +179,7 @@ bad_entry:
goto fail; goto fail;
Eend: Eend:
p = (struct ufs_dir_entry *)(kaddr + offs); p = (struct ufs_dir_entry *)(kaddr + offs);
ufs_error(sb, __FUNCTION__, ufs_error(sb, __func__,
"entry in directory #%lu spans the page boundary" "entry in directory #%lu spans the page boundary"
"offset=%lu", "offset=%lu",
dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs); 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; kaddr += ufs_last_byte(dir, n) - reclen;
while ((char *) de <= kaddr) { while ((char *) de <= kaddr) {
if (de->d_reclen == 0) { if (de->d_reclen == 0) {
ufs_error(dir->i_sb, __FUNCTION__, ufs_error(dir->i_sb, __func__,
"zero-length directory entry"); "zero-length directory entry");
ufs_put_page(page); ufs_put_page(page);
goto out; goto out;
@@ -356,7 +356,7 @@ int ufs_add_link(struct dentry *dentry, struct inode *inode)
goto got_it; goto got_it;
} }
if (de->d_reclen == 0) { if (de->d_reclen == 0) {
ufs_error(dir->i_sb, __FUNCTION__, ufs_error(dir->i_sb, __func__,
"zero-length directory entry"); "zero-length directory entry");
err = -EIO; err = -EIO;
goto out_unlock; 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); struct page *page = ufs_get_page(inode, n);
if (IS_ERR(page)) { if (IS_ERR(page)) {
ufs_error(sb, __FUNCTION__, ufs_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;
@@ -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); limit = kaddr + ufs_last_byte(inode, n) - UFS_DIR_REC_LEN(1);
for ( ;(char*)de <= limit; de = ufs_next_entry(sb, de)) { for ( ;(char*)de <= limit; de = ufs_next_entry(sb, de)) {
if (de->d_reclen == 0) { if (de->d_reclen == 0) {
ufs_error(sb, __FUNCTION__, ufs_error(sb, __func__,
"zero-length directory entry"); "zero-length directory entry");
ufs_put_page(page); ufs_put_page(page);
return -EIO; return -EIO;
@@ -536,7 +536,7 @@ int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir,
while ((char*)de < (char*)dir) { while ((char*)de < (char*)dir) {
if (de->d_reclen == 0) { if (de->d_reclen == 0) {
ufs_error(inode->i_sb, __FUNCTION__, ufs_error(inode->i_sb, __func__,
"zero-length directory entry"); "zero-length directory entry");
err = -EIO; err = -EIO;
goto out; goto out;
@@ -633,7 +633,7 @@ int ufs_empty_dir(struct inode * inode)
while ((char *)de <= kaddr) { while ((char *)de <= kaddr) {
if (de->d_reclen == 0) { if (de->d_reclen == 0) {
ufs_error(inode->i_sb, __FUNCTION__, ufs_error(inode->i_sb, __func__,
"zero-length directory entry: " "zero-length directory entry: "
"kaddr=%p, de=%p\n", kaddr, de); "kaddr=%p, de=%p\n", kaddr, de);
goto not_empty; goto not_empty;

2
fs/ufs/inode.c
View File

@@ -929,7 +929,7 @@ void ufs_delete_inode (struct inode * inode)
old_i_size = inode->i_size; old_i_size = inode->i_size;
inode->i_size = 0; inode->i_size = 0;
if (inode->i_blocks && ufs_truncate(inode, old_i_size)) 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); ufs_free_inode (inode);
unlock_kernel(); unlock_kernel();
return; return;

2
fs/ufs/ufs.h
View File

@@ -66,7 +66,7 @@ struct ufs_inode_info {
#ifdef CONFIG_UFS_DEBUG #ifdef CONFIG_UFS_DEBUG
# define UFSD(f, a...) { \ # define UFSD(f, a...) { \
printk ("UFSD (%s, %d): %s:", \ printk ("UFSD (%s, %d): %s:", \
__FILE__, __LINE__, __FUNCTION__); \ __FILE__, __LINE__, __func__); \
printk (f, ## a); \ printk (f, ## a); \
} }
#else #else