diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 11:29:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 11:29:44 -0700 |
| commit | 23059a0df5fad3d83b9a21fc2696a39148f49617 (patch) | |
| tree | c23275fb1d4f6b4990d38c01344770c2d10f8e71 /fs/fat/fatent.c | |
| parent | 4858704da75ba84ce21e6d4b3b974e8b8594c9f2 (diff) | |
| parent | 21bea495943f9532f16e819066b340762124f5dd (diff) | |
| download | op-kernel-dev-23059a0df5fad3d83b9a21fc2696a39148f49617.zip op-kernel-dev-23059a0df5fad3d83b9a21fc2696a39148f49617.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
fat: split fat_generic_ioctl
FAT: add 'errors' mount option
Diffstat (limited to 'fs/fat/fatent.c')
| -rw-r--r-- | fs/fat/fatent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c index 618f530..a810377 100644 --- a/fs/fat/fatent.c +++ b/fs/fat/fatent.c @@ -348,7 +348,7 @@ int fat_ent_read(struct inode *inode, struct fat_entry *fatent, int entry) if (entry < FAT_START_ENT || sbi->max_cluster <= entry) { fatent_brelse(fatent); - fat_fs_panic(sb, "invalid access to FAT (entry 0x%08x)", entry); + fat_fs_error(sb, "invalid access to FAT (entry 0x%08x)", entry); return -EIO; } @@ -560,7 +560,7 @@ int fat_free_clusters(struct inode *inode, int cluster) err = cluster; goto error; } else if (cluster == FAT_ENT_FREE) { - fat_fs_panic(sb, "%s: deleting FAT entry beyond EOF", + fat_fs_error(sb, "%s: deleting FAT entry beyond EOF", __func__); err = -EIO; goto error; |
