diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-30 03:55:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:54 -0400 |
commit | 8e24eea728068bbeb6a3c500b848f883a20bf225 (patch) | |
tree | 93e79da649723e2766237505b22725fec395f139 /fs/exportfs/expfs.c | |
parent | 530b6412786d7f83592c1a8e2445541ed73fca76 (diff) |
fs: replace remaining __FUNCTION__ occurrences
__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>
Diffstat (limited to 'fs/exportfs/expfs.c')
-rw-r--r-- | fs/exportfs/expfs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/exportfs/expfs.c b/fs/exportfs/expfs.c index 109ab5e44eca..cc91227d3bb8 100644 --- a/fs/exportfs/expfs.c +++ b/fs/exportfs/expfs.c | |||
@@ -150,12 +150,12 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir) | |||
150 | if (IS_ERR(ppd)) { | 150 | if (IS_ERR(ppd)) { |
151 | err = PTR_ERR(ppd); | 151 | err = PTR_ERR(ppd); |
152 | dprintk("%s: get_parent of %ld failed, err %d\n", | 152 | dprintk("%s: get_parent of %ld failed, err %d\n", |
153 | __FUNCTION__, pd->d_inode->i_ino, err); | 153 | __func__, pd->d_inode->i_ino, err); |
154 | dput(pd); | 154 | dput(pd); |
155 | break; | 155 | break; |
156 | } | 156 | } |
157 | 157 | ||
158 | dprintk("%s: find name of %lu in %lu\n", __FUNCTION__, | 158 | dprintk("%s: find name of %lu in %lu\n", __func__, |
159 | pd->d_inode->i_ino, ppd->d_inode->i_ino); | 159 | pd->d_inode->i_ino, ppd->d_inode->i_ino); |
160 | err = exportfs_get_name(mnt, ppd, nbuf, pd); | 160 | err = exportfs_get_name(mnt, ppd, nbuf, pd); |
161 | if (err) { | 161 | if (err) { |
@@ -168,14 +168,14 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir) | |||
168 | continue; | 168 | continue; |
169 | break; | 169 | break; |
170 | } | 170 | } |
171 | dprintk("%s: found name: %s\n", __FUNCTION__, nbuf); | 171 | dprintk("%s: found name: %s\n", __func__, nbuf); |
172 | mutex_lock(&ppd->d_inode->i_mutex); | 172 | mutex_lock(&ppd->d_inode->i_mutex); |
173 | npd = lookup_one_len(nbuf, ppd, strlen(nbuf)); | 173 | npd = lookup_one_len(nbuf, ppd, strlen(nbuf)); |
174 | mutex_unlock(&ppd->d_inode->i_mutex); | 174 | mutex_unlock(&ppd->d_inode->i_mutex); |
175 | if (IS_ERR(npd)) { | 175 | if (IS_ERR(npd)) { |
176 | err = PTR_ERR(npd); | 176 | err = PTR_ERR(npd); |
177 | dprintk("%s: lookup failed: %d\n", | 177 | dprintk("%s: lookup failed: %d\n", |
178 | __FUNCTION__, err); | 178 | __func__, err); |
179 | dput(ppd); | 179 | dput(ppd); |
180 | dput(pd); | 180 | dput(pd); |
181 | break; | 181 | break; |
@@ -188,7 +188,7 @@ reconnect_path(struct vfsmount *mnt, struct dentry *target_dir) | |||
188 | if (npd == pd) | 188 | if (npd == pd) |
189 | noprogress = 0; | 189 | noprogress = 0; |
190 | else | 190 | else |
191 | printk("%s: npd != pd\n", __FUNCTION__); | 191 | printk("%s: npd != pd\n", __func__); |
192 | dput(npd); | 192 | dput(npd); |
193 | dput(ppd); | 193 | dput(ppd); |
194 | if (IS_ROOT(pd)) { | 194 | if (IS_ROOT(pd)) { |