nfs: replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index f288b3ecab4a..58d43daec084 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -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);
@@ -780,7 +780,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;
         }
@@ -808,7 +808,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:
@@ -827,7 +827,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;
 }