Commit 133c8874 authored by Valdis Kletnieks's avatar Valdis Kletnieks Committed by Greg Kroah-Hartman

staging: exfat: Clean up return codes - FFS_FORMATERR

Convert FFS_FORMATERR to -EFSCORRUPTED
Signed-off-by: default avatarValdis Kletnieks <Valdis.Kletnieks@vt.edu>
Link: https://lore.kernel.org/r/20191112021000.42091-2-Valdis.Kletnieks@vt.eduSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b8f64757
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#undef DEBUG #undef DEBUG
#endif #endif
#define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */
#define DENTRY_SIZE 32 /* dir entry size */ #define DENTRY_SIZE 32 /* dir entry size */
#define DENTRY_SIZE_BITS 5 #define DENTRY_SIZE_BITS 5
...@@ -209,7 +211,6 @@ static inline u16 get_row_index(u16 i) ...@@ -209,7 +211,6 @@ static inline u16 get_row_index(u16 i)
/* return values */ /* return values */
#define FFS_SUCCESS 0 #define FFS_SUCCESS 0
#define FFS_MEDIAERR 1 #define FFS_MEDIAERR 1
#define FFS_FORMATERR 2
#define FFS_MOUNTED 3 #define FFS_MOUNTED 3
#define FFS_NOTMOUNTED 4 #define FFS_NOTMOUNTED 4
#define FFS_ALIGNMENTERR 5 #define FFS_ALIGNMENTERR 5
......
...@@ -573,7 +573,7 @@ s32 load_alloc_bitmap(struct super_block *sb) ...@@ -573,7 +573,7 @@ s32 load_alloc_bitmap(struct super_block *sb)
return FFS_MEDIAERR; return FFS_MEDIAERR;
} }
return FFS_FORMATERR; return -EFSCORRUPTED;
} }
void free_alloc_bitmap(struct super_block *sb) void free_alloc_bitmap(struct super_block *sb)
...@@ -3016,7 +3016,7 @@ s32 fat16_mount(struct super_block *sb, struct pbr_sector_t *p_pbr) ...@@ -3016,7 +3016,7 @@ s32 fat16_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info); struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
if (p_bpb->num_fats == 0) if (p_bpb->num_fats == 0)
return FFS_FORMATERR; return -EFSCORRUPTED;
num_root_sectors = GET16(p_bpb->num_root_entries) << DENTRY_SIZE_BITS; num_root_sectors = GET16(p_bpb->num_root_entries) << DENTRY_SIZE_BITS;
num_root_sectors = ((num_root_sectors - 1) >> num_root_sectors = ((num_root_sectors - 1) >>
...@@ -3078,7 +3078,7 @@ s32 fat32_mount(struct super_block *sb, struct pbr_sector_t *p_pbr) ...@@ -3078,7 +3078,7 @@ s32 fat32_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info); struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
if (p_bpb->num_fats == 0) if (p_bpb->num_fats == 0)
return FFS_FORMATERR; return -EFSCORRUPTED;
p_fs->sectors_per_clu = p_bpb->sectors_per_clu; p_fs->sectors_per_clu = p_bpb->sectors_per_clu;
p_fs->sectors_per_clu_bits = ilog2(p_bpb->sectors_per_clu); p_fs->sectors_per_clu_bits = ilog2(p_bpb->sectors_per_clu);
...@@ -3157,7 +3157,7 @@ s32 exfat_mount(struct super_block *sb, struct pbr_sector_t *p_pbr) ...@@ -3157,7 +3157,7 @@ s32 exfat_mount(struct super_block *sb, struct pbr_sector_t *p_pbr)
struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info); struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
if (p_bpb->num_fats == 0) if (p_bpb->num_fats == 0)
return FFS_FORMATERR; return -EFSCORRUPTED;
p_fs->sectors_per_clu = 1 << p_bpb->sectors_per_clu_bits; p_fs->sectors_per_clu = 1 << p_bpb->sectors_per_clu_bits;
p_fs->sectors_per_clu_bits = p_bpb->sectors_per_clu_bits; p_fs->sectors_per_clu_bits = p_bpb->sectors_per_clu_bits;
......
...@@ -384,7 +384,7 @@ static int ffsMountVol(struct super_block *sb) ...@@ -384,7 +384,7 @@ static int ffsMountVol(struct super_block *sb)
if (GET16_A(p_pbr->signature) != PBR_SIGNATURE) { if (GET16_A(p_pbr->signature) != PBR_SIGNATURE) {
brelse(tmp_bh); brelse(tmp_bh);
bdev_close(sb); bdev_close(sb);
ret = FFS_FORMATERR; ret = -EFSCORRUPTED;
goto out; goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment