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/configfs | |
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/configfs')
-rw-r--r-- | fs/configfs/file.c | 2 | ||||
-rw-r--r-- | fs/configfs/mount.c | 2 | ||||
-rw-r--r-- | fs/configfs/symlink.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/configfs/file.c b/fs/configfs/file.c index 397cb503a180..2b6cb23dd14e 100644 --- a/fs/configfs/file.c +++ b/fs/configfs/file.c | |||
@@ -115,7 +115,7 @@ configfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *pp | |||
115 | goto out; | 115 | goto out; |
116 | } | 116 | } |
117 | pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n", | 117 | pr_debug("%s: count = %zd, ppos = %lld, buf = %s\n", |
118 | __FUNCTION__, count, *ppos, buffer->page); | 118 | __func__, count, *ppos, buffer->page); |
119 | retval = simple_read_from_buffer(buf, count, ppos, buffer->page, | 119 | retval = simple_read_from_buffer(buf, count, ppos, buffer->page, |
120 | buffer->count); | 120 | buffer->count); |
121 | out: | 121 | out: |
diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c index de3b31d0a37d..8421cea7d8c7 100644 --- a/fs/configfs/mount.c +++ b/fs/configfs/mount.c | |||
@@ -92,7 +92,7 @@ static int configfs_fill_super(struct super_block *sb, void *data, int silent) | |||
92 | 92 | ||
93 | root = d_alloc_root(inode); | 93 | root = d_alloc_root(inode); |
94 | if (!root) { | 94 | if (!root) { |
95 | pr_debug("%s: could not get root dentry!\n",__FUNCTION__); | 95 | pr_debug("%s: could not get root dentry!\n",__func__); |
96 | iput(inode); | 96 | iput(inode); |
97 | return -ENOMEM; | 97 | return -ENOMEM; |
98 | } | 98 | } |
diff --git a/fs/configfs/symlink.c b/fs/configfs/symlink.c index 78929ea84ff2..2a731ef5f305 100644 --- a/fs/configfs/symlink.c +++ b/fs/configfs/symlink.c | |||
@@ -210,13 +210,13 @@ static int configfs_get_target_path(struct config_item * item, struct config_ite | |||
210 | if (size > PATH_MAX) | 210 | if (size > PATH_MAX) |
211 | return -ENAMETOOLONG; | 211 | return -ENAMETOOLONG; |
212 | 212 | ||
213 | pr_debug("%s: depth = %d, size = %d\n", __FUNCTION__, depth, size); | 213 | pr_debug("%s: depth = %d, size = %d\n", __func__, depth, size); |
214 | 214 | ||
215 | for (s = path; depth--; s += 3) | 215 | for (s = path; depth--; s += 3) |
216 | strcpy(s,"../"); | 216 | strcpy(s,"../"); |
217 | 217 | ||
218 | fill_item_path(target, path, size); | 218 | fill_item_path(target, path, size); |
219 | pr_debug("%s: path = '%s'\n", __FUNCTION__, path); | 219 | pr_debug("%s: path = '%s'\n", __func__, path); |
220 | 220 | ||
221 | return 0; | 221 | return 0; |
222 | } | 222 | } |