Re: [PATCH v2 01/10] staging: exfat: Clean up return codes - FFS_FORMATERR
On Tue, 05 Nov 2019 18:05:15 +0100, Greg Kroah-Hartman said:
> This patch breaks the build:
>
> drivers/staging/exfat/exfat_super.c: In function âffsMountVolâ:
> drivers/staging/exfat/exfat_super.c:387:9: error: âFFS_FORMATERRâ
> undeclared
(first use in this function)
> 387 | ret = FFS_FORMATERR;
> | ^
>
>
> Did you test-build this thing?
Yes.
And in my tree, that section of code has:
385 /* check the validity of PBR */
386 if (GET16_A(p_pbr->signature) != PBR_SIGNATURE) {
387 brelse(tmp_bh);
388 bdev_close(sb);
389 ret = -EFSCORRUPTED;
390 goto out;
391 }
but 'git blame' says that was changed in patch 02/10 not 01/10, most likely
due to a miscue with 'git add'.
Will fix and resend.
pgpa9bGcfbHHf.pgp
Description: PGP signature
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 01/10] staging: exfat: Clean up return codes - FFS_FORMATERR
On Sun, Nov 03, 2019 at 08:44:57PM -0500, Valdis Kletnieks wrote: > Convert FFS_FORMATERR to -EFSCORRUPTED > > Signed-off-by: Valdis Kletnieks > --- > drivers/staging/exfat/exfat.h | 3 ++- > drivers/staging/exfat/exfat_core.c | 8 > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h > index acb73f47a253..4f9ba235d967 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_MEDIAERR1 > -#define FFS_FORMATERR 2 > #define FFS_MOUNTED 3 > #define FFS_NOTMOUNTED 4 > #define FFS_ALIGNMENTERR5 > diff --git a/drivers/staging/exfat/exfat_core.c > b/drivers/staging/exfat/exfat_core.c > index b23fbf3ebaa5..e90b54a17150 100644 > --- 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; This patch breaks the build: drivers/staging/exfat/exfat_super.c: In function ‘ffsMountVol’: drivers/staging/exfat/exfat_super.c:387:9: error: ‘FFS_FORMATERR’ undeclared (first use in this function) 387 | ret = FFS_FORMATERR; | ^ Did you test-build this thing? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 01/10] staging: exfat: Clean up return codes - FFS_FORMATERR
Convert FFS_FORMATERR to -EFSCORRUPTED Signed-off-by: Valdis Kletnieks --- drivers/staging/exfat/exfat.h | 3 ++- drivers/staging/exfat/exfat_core.c | 8 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/staging/exfat/exfat.h b/drivers/staging/exfat/exfat.h index acb73f47a253..4f9ba235d967 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_SIZE32 /* 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_MEDIAERR1 -#define FFS_FORMATERR 2 #define FFS_MOUNTED 3 #define FFS_NOTMOUNTED 4 #define FFS_ALIGNMENTERR5 diff --git a/drivers/staging/exfat/exfat_core.c b/drivers/staging/exfat/exfat_core.c index b23fbf3ebaa5..e90b54a17150 100644 --- 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; -- 2.24.0.rc1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
