diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /fs/msdos/namei.c | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/msdos/namei.c')
| -rw-r--r-- | fs/msdos/namei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/msdos/namei.c b/fs/msdos/namei.c index 2d4358c59f68..05ff4f1d7026 100644 --- a/fs/msdos/namei.c +++ b/fs/msdos/namei.c | |||
| @@ -609,7 +609,7 @@ error_inode: | |||
| 609 | if (corrupt < 0) { | 609 | if (corrupt < 0) { |
| 610 | fat_fs_panic(new_dir->i_sb, | 610 | fat_fs_panic(new_dir->i_sb, |
| 611 | "%s: Filesystem corrupted (i_pos %lld)", | 611 | "%s: Filesystem corrupted (i_pos %lld)", |
| 612 | __FUNCTION__, sinfo.i_pos); | 612 | __func__, sinfo.i_pos); |
| 613 | } | 613 | } |
| 614 | goto out; | 614 | goto out; |
| 615 | } | 615 | } |