ufs: replace remaining __FUNCTION__ occurrences

__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>

diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index 1e7598fb97879d3a686939ec24a60234a7518bbf..0d9ada173739c2c0ef701ff361afda1843cfd543 100644 (file)
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -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;
                                }

diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c
index ef563fc8d72c3b62418d5ae13548ae156548d94a..df0bef18742dc63b6dee218e029b2e90d35b1c37 100644 (file)
--- a/fs/ufs/dir.c
+++ b/fs/ufs/dir.c
@@ -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;

diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 5446b888fc8e34448078b22096983b04262b71dc..39f8778985655b1f1a166575e013b940af7965d4 100644 (file)
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -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;

diff --git a/fs/ufs/ufs.h b/fs/ufs/ufs.h
index fcb9231bb9edac22b09593d8fa1d5e80624cde6a..244a1aaa940eea43a82619ff8bde98fa27b4caed 100644 (file)
--- a/fs/ufs/ufs.h
+++ b/fs/ufs/ufs.h
@@ -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