diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-28 05:16:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:46 -0400 |
commit | fbe5498b3d5af44a8671800e85b2858c2ea236fa (patch) | |
tree | 2dcd7a66cdcbe6742bde41cf05933c2d4ad1879d /fs/reiserfs/namei.c | |
parent | 8acc570fabc022d41baedc0c9bf976a4b9d16d6f (diff) |
reiserfs: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs/namei.c')
-rw-r--r-- | fs/reiserfs/namei.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index 8867533cb727..c1add28dd45e 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c | |||
@@ -301,7 +301,7 @@ static int reiserfs_find_entry(struct inode *dir, const char *name, int namelen, | |||
301 | path_to_entry, de); | 301 | path_to_entry, de); |
302 | if (retval == IO_ERROR) { | 302 | if (retval == IO_ERROR) { |
303 | reiserfs_warning(dir->i_sb, "zam-7001: io error in %s", | 303 | reiserfs_warning(dir->i_sb, "zam-7001: io error in %s", |
304 | __FUNCTION__); | 304 | __func__); |
305 | return IO_ERROR; | 305 | return IO_ERROR; |
306 | } | 306 | } |
307 | 307 | ||
@@ -496,7 +496,7 @@ static int reiserfs_add_entry(struct reiserfs_transaction_handle *th, | |||
496 | reiserfs_warning(dir->i_sb, | 496 | reiserfs_warning(dir->i_sb, |
497 | "zam-7002:%s: \"reiserfs_find_entry\" " | 497 | "zam-7002:%s: \"reiserfs_find_entry\" " |
498 | "has returned unexpected value (%d)", | 498 | "has returned unexpected value (%d)", |
499 | __FUNCTION__, retval); | 499 | __func__, retval); |
500 | } | 500 | } |
501 | 501 | ||
502 | return -EEXIST; | 502 | return -EEXIST; |
@@ -907,7 +907,7 @@ static int reiserfs_rmdir(struct inode *dir, struct dentry *dentry) | |||
907 | 907 | ||
908 | if (inode->i_nlink != 2 && inode->i_nlink != 1) | 908 | if (inode->i_nlink != 2 && inode->i_nlink != 1) |
909 | reiserfs_warning(inode->i_sb, "%s: empty directory has nlink " | 909 | reiserfs_warning(inode->i_sb, "%s: empty directory has nlink " |
910 | "!= 2 (%d)", __FUNCTION__, inode->i_nlink); | 910 | "!= 2 (%d)", __func__, inode->i_nlink); |
911 | 911 | ||
912 | clear_nlink(inode); | 912 | clear_nlink(inode); |
913 | inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; | 913 | inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; |
@@ -984,7 +984,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry) | |||
984 | 984 | ||
985 | if (!inode->i_nlink) { | 985 | if (!inode->i_nlink) { |
986 | reiserfs_warning(inode->i_sb, "%s: deleting nonexistent file " | 986 | reiserfs_warning(inode->i_sb, "%s: deleting nonexistent file " |
987 | "(%s:%lu), %d", __FUNCTION__, | 987 | "(%s:%lu), %d", __func__, |
988 | reiserfs_bdevname(inode->i_sb), inode->i_ino, | 988 | reiserfs_bdevname(inode->i_sb), inode->i_ino, |
989 | inode->i_nlink); | 989 | inode->i_nlink); |
990 | inode->i_nlink = 1; | 990 | inode->i_nlink = 1; |