git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into next
[pandora-kernel.git]
/
fs
/
fat
/
cache.c
diff --git
a/fs/fat/cache.c
b/fs/fat/cache.c
index
b426022
..
923990e
100644
(file)
--- a/
fs/fat/cache.c
+++ b/
fs/fat/cache.c
@@
-241,7
+241,7
@@
int fat_get_cluster(struct inode *inode, int cluster, int *fclus, int *dclus)
while (*fclus < cluster) {
/* prevent the infinite loop of cluster chain */
if (*fclus > limit) {
while (*fclus < cluster) {
/* prevent the infinite loop of cluster chain */
if (*fclus > limit) {
- fat_fs_
panic
(sb, "%s: detected the cluster chain loop"
+ fat_fs_
error
(sb, "%s: detected the cluster chain loop"
" (i_pos %lld)", __func__,
MSDOS_I(inode)->i_pos);
nr = -EIO;
" (i_pos %lld)", __func__,
MSDOS_I(inode)->i_pos);
nr = -EIO;
@@
-252,7
+252,7
@@
int fat_get_cluster(struct inode *inode, int cluster, int *fclus, int *dclus)
if (nr < 0)
goto out;
else if (nr == FAT_ENT_FREE) {
if (nr < 0)
goto out;
else if (nr == FAT_ENT_FREE) {
- fat_fs_
panic
(sb, "%s: invalid cluster chain"
+ fat_fs_
error
(sb, "%s: invalid cluster chain"
" (i_pos %lld)", __func__,
MSDOS_I(inode)->i_pos);
nr = -EIO;
" (i_pos %lld)", __func__,
MSDOS_I(inode)->i_pos);
nr = -EIO;
@@
-285,7
+285,7
@@
static int fat_bmap_cluster(struct inode *inode, int cluster)
if (ret < 0)
return ret;
else if (ret == FAT_ENT_EOF) {
if (ret < 0)
return ret;
else if (ret == FAT_ENT_EOF) {
- fat_fs_
panic
(sb, "%s: request beyond EOF (i_pos %lld)",
+ fat_fs_
error
(sb, "%s: request beyond EOF (i_pos %lld)",
__func__, MSDOS_I(inode)->i_pos);
return -EIO;
}
__func__, MSDOS_I(inode)->i_pos);
return -EIO;
}