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/fat/file.c | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/fat/file.c')
| -rw-r--r-- | fs/fat/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fat/file.c b/fs/fat/file.c index d604bb132422..27cc1164ec36 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c | |||
| @@ -208,7 +208,7 @@ static int fat_free(struct inode *inode, int skip) | |||
| 208 | } else if (ret == FAT_ENT_FREE) { | 208 | } else if (ret == FAT_ENT_FREE) { |
| 209 | fat_fs_panic(sb, | 209 | fat_fs_panic(sb, |
| 210 | "%s: invalid cluster chain (i_pos %lld)", | 210 | "%s: invalid cluster chain (i_pos %lld)", |
| 211 | __FUNCTION__, MSDOS_I(inode)->i_pos); | 211 | __func__, MSDOS_I(inode)->i_pos); |
| 212 | ret = -EIO; | 212 | ret = -EIO; |
| 213 | } else if (ret > 0) { | 213 | } else if (ret > 0) { |
| 214 | err = fat_ent_write(inode, &fatent, FAT_ENT_EOF, wait); | 214 | err = fat_ent_write(inode, &fatent, FAT_ENT_EOF, wait); |