diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-05 23:47:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-05 23:47:47 -0500 |
commit | 0dc47877a3de00ceadea0005189656ae8dc52669 (patch) | |
tree | 7440a87385fe318cb42f0ae161be195f5e967d82 /net/sunrpc/rpc_pipe.c | |
parent | 6387c4bed539539b05fa773cf2ff26529dc3074c (diff) |
net: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sunrpc/rpc_pipe.c')
-rw-r--r-- | net/sunrpc/rpc_pipe.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 1b395a41a8b2..5a9b0e7828cd 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
@@ -479,13 +479,13 @@ rpc_lookup_parent(char *path, struct nameidata *nd) | |||
479 | mnt = rpc_get_mount(); | 479 | mnt = rpc_get_mount(); |
480 | if (IS_ERR(mnt)) { | 480 | if (IS_ERR(mnt)) { |
481 | printk(KERN_WARNING "%s: %s failed to mount " | 481 | printk(KERN_WARNING "%s: %s failed to mount " |
482 | "pseudofilesystem \n", __FILE__, __FUNCTION__); | 482 | "pseudofilesystem \n", __FILE__, __func__); |
483 | return PTR_ERR(mnt); | 483 | return PTR_ERR(mnt); |
484 | } | 484 | } |
485 | 485 | ||
486 | if (vfs_path_lookup(mnt->mnt_root, mnt, path, LOOKUP_PARENT, nd)) { | 486 | if (vfs_path_lookup(mnt->mnt_root, mnt, path, LOOKUP_PARENT, nd)) { |
487 | printk(KERN_WARNING "%s: %s failed to find path %s\n", | 487 | printk(KERN_WARNING "%s: %s failed to find path %s\n", |
488 | __FILE__, __FUNCTION__, path); | 488 | __FILE__, __func__, path); |
489 | rpc_put_mount(); | 489 | rpc_put_mount(); |
490 | return -ENOENT; | 490 | return -ENOENT; |
491 | } | 491 | } |
@@ -604,7 +604,7 @@ rpc_populate(struct dentry *parent, | |||
604 | out_bad: | 604 | out_bad: |
605 | mutex_unlock(&dir->i_mutex); | 605 | mutex_unlock(&dir->i_mutex); |
606 | printk(KERN_WARNING "%s: %s failed to populate directory %s\n", | 606 | printk(KERN_WARNING "%s: %s failed to populate directory %s\n", |
607 | __FILE__, __FUNCTION__, parent->d_name.name); | 607 | __FILE__, __func__, parent->d_name.name); |
608 | return -ENOMEM; | 608 | return -ENOMEM; |
609 | } | 609 | } |
610 | 610 | ||
@@ -623,7 +623,7 @@ __rpc_mkdir(struct inode *dir, struct dentry *dentry) | |||
623 | return 0; | 623 | return 0; |
624 | out_err: | 624 | out_err: |
625 | printk(KERN_WARNING "%s: %s failed to allocate inode for dentry %s\n", | 625 | printk(KERN_WARNING "%s: %s failed to allocate inode for dentry %s\n", |
626 | __FILE__, __FUNCTION__, dentry->d_name.name); | 626 | __FILE__, __func__, dentry->d_name.name); |
627 | return -ENOMEM; | 627 | return -ENOMEM; |
628 | } | 628 | } |
629 | 629 | ||
@@ -715,7 +715,7 @@ err_depopulate: | |||
715 | err_dput: | 715 | err_dput: |
716 | dput(dentry); | 716 | dput(dentry); |
717 | printk(KERN_WARNING "%s: %s() failed to create directory %s (errno = %d)\n", | 717 | printk(KERN_WARNING "%s: %s() failed to create directory %s (errno = %d)\n", |
718 | __FILE__, __FUNCTION__, path, error); | 718 | __FILE__, __func__, path, error); |
719 | dentry = ERR_PTR(error); | 719 | dentry = ERR_PTR(error); |
720 | goto out; | 720 | goto out; |
721 | } | 721 | } |
@@ -804,7 +804,7 @@ err_dput: | |||
804 | dput(dentry); | 804 | dput(dentry); |
805 | dentry = ERR_PTR(-ENOMEM); | 805 | dentry = ERR_PTR(-ENOMEM); |
806 | printk(KERN_WARNING "%s: %s() failed to create pipe %s/%s (errno = %d)\n", | 806 | printk(KERN_WARNING "%s: %s() failed to create pipe %s/%s (errno = %d)\n", |
807 | __FILE__, __FUNCTION__, parent->d_name.name, name, | 807 | __FILE__, __func__, parent->d_name.name, name, |
808 | -ENOMEM); | 808 | -ENOMEM); |
809 | goto out; | 809 | goto out; |
810 | } | 810 | } |