diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-05-02 16:42:44 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-05-16 12:43:29 -0400 |
commit | 3110ff8048fb757b36112b044b384aea9c44d6e4 (patch) | |
tree | 5260f4973bd0848ddef3fb3c111386e59616abbc /fs/nfs/namespace.c | |
parent | 46c8ac74250a396aca855e494f49a960797a6b5e (diff) |
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>
Diffstat (limited to 'fs/nfs/namespace.c')
-rw-r--r-- | fs/nfs/namespace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c index af4d0f1e402c..fca518006a52 100644 --- a/fs/nfs/namespace.c +++ b/fs/nfs/namespace.c | |||
@@ -106,7 +106,7 @@ static void * nfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) | |||
106 | dprintk("--> nfs_follow_mountpoint()\n"); | 106 | dprintk("--> nfs_follow_mountpoint()\n"); |
107 | 107 | ||
108 | BUG_ON(IS_ROOT(dentry)); | 108 | BUG_ON(IS_ROOT(dentry)); |
109 | dprintk("%s: enter\n", __FUNCTION__); | 109 | dprintk("%s: enter\n", __func__); |
110 | dput(nd->path.dentry); | 110 | dput(nd->path.dentry); |
111 | nd->path.dentry = dget(dentry); | 111 | nd->path.dentry = dget(dentry); |
112 | 112 | ||
@@ -143,7 +143,7 @@ static void * nfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) | |||
143 | nd->path.dentry = dget(mnt->mnt_root); | 143 | nd->path.dentry = dget(mnt->mnt_root); |
144 | schedule_delayed_work(&nfs_automount_task, nfs_mountpoint_expiry_timeout); | 144 | schedule_delayed_work(&nfs_automount_task, nfs_mountpoint_expiry_timeout); |
145 | out: | 145 | out: |
146 | dprintk("%s: done, returned %d\n", __FUNCTION__, err); | 146 | dprintk("%s: done, returned %d\n", __func__, err); |
147 | 147 | ||
148 | dprintk("<-- nfs_follow_mountpoint() = %d\n", err); | 148 | dprintk("<-- nfs_follow_mountpoint() = %d\n", err); |
149 | return ERR_PTR(err); | 149 | return ERR_PTR(err); |
@@ -230,7 +230,7 @@ static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent, | |||
230 | 230 | ||
231 | dprintk("--> nfs_do_submount()\n"); | 231 | dprintk("--> nfs_do_submount()\n"); |
232 | 232 | ||
233 | dprintk("%s: submounting on %s/%s\n", __FUNCTION__, | 233 | dprintk("%s: submounting on %s/%s\n", __func__, |
234 | dentry->d_parent->d_name.name, | 234 | dentry->d_parent->d_name.name, |
235 | dentry->d_name.name); | 235 | dentry->d_name.name); |
236 | if (page == NULL) | 236 | if (page == NULL) |
@@ -243,7 +243,7 @@ static struct vfsmount *nfs_do_submount(const struct vfsmount *mnt_parent, | |||
243 | free_page: | 243 | free_page: |
244 | free_page((unsigned long)page); | 244 | free_page((unsigned long)page); |
245 | out: | 245 | out: |
246 | dprintk("%s: done\n", __FUNCTION__); | 246 | dprintk("%s: done\n", __func__); |
247 | 247 | ||
248 | dprintk("<-- nfs_do_submount() = %p\n", mnt); | 248 | dprintk("<-- nfs_do_submount() = %p\n", mnt); |
249 | return mnt; | 249 | return mnt; |