| Message ID | 20191024155327.1095907-10-Valdis.Kletnieks@vt.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging: exfat: Clean up return codes | expand |
On Thu, Oct 24, 2019 at 11:53:20AM -0400, Valdis Kletnieks wrote: > Convert FFS_FORMATERR to -EFSCORRUPTED > > Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> > --- > drivers/staging/exfat/exfat.h | 3 ++- > drivers/staging/exfat/exfat_core.c | 4 ++-- > drivers/staging/exfat/exfat_super.c | 2 +- > 3 files changed, 5 insertions(+), 4 deletions(-) This causes build errors, maybe because I didn't take your other series. So I'm stopping here, please rebase and resend. thanks, greg k-h
diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h index 2588a6cbe552..7ca187e77cbe 100644 --- 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 fa2bf18b4a14..39c103e73b63 100644 --- a/drivers/staging/exfat/exfat_core.c +++ b/drivers/staging/exfat/exfat_core.c @@ -205,7 +205,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) @@ -2309,7 +2309,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 5b35e3683605..161971c80c02 100644 --- 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; }
Convert FFS_FORMATERR to -EFSCORRUPTED Signed-off-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> --- drivers/staging/exfat/exfat.h | 3 ++- drivers/staging/exfat/exfat_core.c | 4 ++-- drivers/staging/exfat/exfat_super.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)