summaryrefslogtreecommitdiffstats
path: root/fs/vfat/namei.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-05-06 19:55:32 +0200
committerSteve French <sfrench@us.ibm.com>2008-05-06 19:55:32 +0200
commita815752ac0ffdb910e92958d41d28f4fb28e5296 (patch)
treea3aa16a282354da0debe8e3a3a7ed8aac6e54001 /fs/vfat/namei.c
parent[CIFS] fix typo (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff)
downloadlinux-a815752ac0ffdb910e92958d41d28f4fb28e5296.tar.xz
linux-a815752ac0ffdb910e92958d41d28f4fb28e5296.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/vfat/namei.c')
-rw-r--r--fs/vfat/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/vfat/namei.c b/fs/vfat/namei.c
index 5b66162d0747..a3522727ea5b 100644
--- a/fs/vfat/namei.c
+++ b/fs/vfat/namei.c
@@ -986,7 +986,7 @@ error_inode:
if (corrupt < 0) {
fat_fs_panic(new_dir->i_sb,
"%s: Filesystem corrupted (i_pos %lld)",
- __FUNCTION__, sinfo.i_pos);
+ __func__, sinfo.i_pos);
}
goto out;
}