diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-10 13:14:34 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2008-03-10 13:14:34 -0400 |
commit | 55f78e1771f0886162edd441dd4f39c287779de2 (patch) | |
tree | 95ebc11a8730e85b70e4a8da04f6d0f7cd5e40f8 /fs/cifs/cifs_dfs_ref.c | |
parent | 7962670e648a0431338a7ce73847c24bc023d095 (diff) |
[CIFS] cifs: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifs_dfs_ref.c')
-rw-r--r-- | fs/cifs/cifs_dfs_ref.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index 7f8838253410..a1a95b027136 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c | |||
@@ -74,7 +74,7 @@ static char *cifs_get_share_name(const char *node_name) | |||
74 | pSep = memchr(UNC+2, '\\', len-2); | 74 | pSep = memchr(UNC+2, '\\', len-2); |
75 | if (!pSep) { | 75 | if (!pSep) { |
76 | cERROR(1, ("%s: no server name end in node name: %s", | 76 | cERROR(1, ("%s: no server name end in node name: %s", |
77 | __FUNCTION__, node_name)); | 77 | __func__, node_name)); |
78 | kfree(UNC); | 78 | kfree(UNC); |
79 | return NULL; | 79 | return NULL; |
80 | } | 80 | } |
@@ -84,7 +84,7 @@ static char *cifs_get_share_name(const char *node_name) | |||
84 | pSep = memchr(UNC+(pSep-UNC), '\\', len-(pSep-UNC)); | 84 | pSep = memchr(UNC+(pSep-UNC), '\\', len-(pSep-UNC)); |
85 | if (!pSep) { | 85 | if (!pSep) { |
86 | cERROR(1, ("%s:2 cant find share name in node name: %s", | 86 | cERROR(1, ("%s:2 cant find share name in node name: %s", |
87 | __FUNCTION__, node_name)); | 87 | __func__, node_name)); |
88 | kfree(UNC); | 88 | kfree(UNC); |
89 | return NULL; | 89 | return NULL; |
90 | } | 90 | } |
@@ -127,7 +127,7 @@ static char *compose_mount_options(const char *sb_mountdata, | |||
127 | rc = dns_resolve_server_name_to_ip(*devname, &srvIP); | 127 | rc = dns_resolve_server_name_to_ip(*devname, &srvIP); |
128 | if (rc != 0) { | 128 | if (rc != 0) { |
129 | cERROR(1, ("%s: Failed to resolve server part of %s to IP", | 129 | cERROR(1, ("%s: Failed to resolve server part of %s to IP", |
130 | __FUNCTION__, *devname)); | 130 | __func__, *devname)); |
131 | mountdata = ERR_PTR(rc); | 131 | mountdata = ERR_PTR(rc); |
132 | goto compose_mount_options_out; | 132 | goto compose_mount_options_out; |
133 | } | 133 | } |
@@ -181,8 +181,8 @@ static char *compose_mount_options(const char *sb_mountdata, | |||
181 | } | 181 | } |
182 | } | 182 | } |
183 | 183 | ||
184 | /*cFYI(1,("%s: parent mountdata: %s", __FUNCTION__,sb_mountdata));*/ | 184 | /*cFYI(1,("%s: parent mountdata: %s", __func__,sb_mountdata));*/ |
185 | /*cFYI(1, ("%s: submount mountdata: %s", __FUNCTION__, mountdata ));*/ | 185 | /*cFYI(1, ("%s: submount mountdata: %s", __func__, mountdata ));*/ |
186 | 186 | ||
187 | compose_mount_options_out: | 187 | compose_mount_options_out: |
188 | kfree(srvIP); | 188 | kfree(srvIP); |
@@ -302,7 +302,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) | |||
302 | int rc = 0; | 302 | int rc = 0; |
303 | struct vfsmount *mnt = ERR_PTR(-ENOENT); | 303 | struct vfsmount *mnt = ERR_PTR(-ENOENT); |
304 | 304 | ||
305 | cFYI(1, ("in %s", __FUNCTION__)); | 305 | cFYI(1, ("in %s", __func__)); |
306 | BUG_ON(IS_ROOT(dentry)); | 306 | BUG_ON(IS_ROOT(dentry)); |
307 | 307 | ||
308 | xid = GetXid(); | 308 | xid = GetXid(); |
@@ -336,7 +336,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) | |||
336 | len = strlen(referrals[i].node_name); | 336 | len = strlen(referrals[i].node_name); |
337 | if (len < 2) { | 337 | if (len < 2) { |
338 | cERROR(1, ("%s: Net Address path too short: %s", | 338 | cERROR(1, ("%s: Net Address path too short: %s", |
339 | __FUNCTION__, referrals[i].node_name)); | 339 | __func__, referrals[i].node_name)); |
340 | rc = -EINVAL; | 340 | rc = -EINVAL; |
341 | goto out_err; | 341 | goto out_err; |
342 | } | 342 | } |
@@ -344,7 +344,7 @@ cifs_dfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd) | |||
344 | nd->path.dentry, | 344 | nd->path.dentry, |
345 | referrals[i].node_name); | 345 | referrals[i].node_name); |
346 | cFYI(1, ("%s: cifs_dfs_do_refmount:%s , mnt:%p", | 346 | cFYI(1, ("%s: cifs_dfs_do_refmount:%s , mnt:%p", |
347 | __FUNCTION__, | 347 | __func__, |
348 | referrals[i].node_name, mnt)); | 348 | referrals[i].node_name, mnt)); |
349 | 349 | ||
350 | /* complete mount procedure if we accured submount */ | 350 | /* complete mount procedure if we accured submount */ |
@@ -365,7 +365,7 @@ out: | |||
365 | FreeXid(xid); | 365 | FreeXid(xid); |
366 | free_dfs_info_array(referrals, num_referrals); | 366 | free_dfs_info_array(referrals, num_referrals); |
367 | kfree(full_path); | 367 | kfree(full_path); |
368 | cFYI(1, ("leaving %s" , __FUNCTION__)); | 368 | cFYI(1, ("leaving %s" , __func__)); |
369 | return ERR_PTR(rc); | 369 | return ERR_PTR(rc); |
370 | out_err: | 370 | out_err: |
371 | path_put(&nd->path); | 371 | path_put(&nd->path); |