staging: exfat: Clean up return codes - FFS_FORMATERR

Convert FFS_FORMATERR to -EFSCORRUPTED

Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Link: https://lore.kernel.org/r/20191112021000.42091-2-Valdis.Kletnieks@vt.edu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h
index acb73f47a253bcaa45a7b434d2ac15fbf81dfb9e..4f9ba235d967b2e3d000e0822ce0f44310ee23a3 100644 (file)
--- a/drivers/staging/exfat/exfat.h
+++ b/drivers/staging/exfat/exfat.h
@@ -30,6 +30,8 @@
 #undef DEBUG
 #endif
 
+#define EFSCORRUPTED   EUCLEAN         /* Filesystem is corrupted */
+
 #define DENTRY_SIZE            32      /* dir entry size */
 #define DENTRY_SIZE_BITS       5
 
@@ -209,7 +211,6 @@ static inline u16 get_row_index(u16 i)
 /* return values */
 #define FFS_SUCCESS             0
 #define FFS_MEDIAERR            1
-#define FFS_FORMATERR           2
 #define FFS_MOUNTED             3
 #define FFS_NOTMOUNTED          4
 #define FFS_ALIGNMENTERR        5

diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c
index b23fbf3ebaa5c77eb4d3fa09ebdf545591efd626..e90b54a1715078d48dc1364deab0d3476dc856bf 100644 (file)
--- a/drivers/staging/exfat/exfat_core.c
+++ b/drivers/staging/exfat/exfat_core.c
@@ -573,7 +573,7 @@ s32 load_alloc_bitmap(struct super_block *sb)
                        return FFS_MEDIAERR;
        }
 
-       return FFS_FORMATERR;
+       return -EFSCORRUPTED;
 }
 
 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)
        struct bd_info_t *p_bd = &(EXFAT_SB(sb)->bd_info);
 
        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 = ((num_root_sectors - 1) >>
@@ -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);
 
        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_bits = ilog2(p_bpb->sectors_per_clu);
@@ -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);
 
        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_bits = p_bpb->sectors_per_clu_bits;

diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
index ee3d64178069ca14931f94e3ba2840a48ad541dc..9337fd4caaae1e6326c81aef8e0d10e885b62351 100644 (file)
--- a/drivers/staging/exfat/exfat_super.c
+++ b/drivers/staging/exfat/exfat_super.c
@@ -384,7 +384,7 @@ static int ffsMountVol(struct super_block *sb)
        if (GET16_A(p_pbr->signature) != PBR_SIGNATURE) {
                brelse(tmp_bh);
                bdev_close(sb);
-               ret = FFS_FORMATERR;
+               ret = -EFSCORRUPTED;
                goto out;
        }