From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Cc: linux-fsdevel@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 01/10] staging: exfat: Clean up return codes - FFS_FORMATERR
Date: Tue, 5 Nov 2019 18:05:15 +0100 [thread overview]
Message-ID: <20191105170515.GA2788121@kroah.com> (raw)
In-Reply-To: <20191104014510.102356-2-Valdis.Kletnieks@vt.edu>
On Sun, Nov 03, 2019 at 08:44:57PM -0500, 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 | 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_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 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
next prev parent reply other threads:[~2019-11-05 17:05 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 1:44 [PATCH v2 00/10] staging: exfat: Clean up return codes, revisited Valdis Kletnieks
2019-11-04 1:44 ` [PATCH v2 01/10] staging: exfat: Clean up return codes - FFS_FORMATERR Valdis Kletnieks
2019-11-05 17:05 ` Greg Kroah-Hartman [this message]
2019-11-05 22:20 ` Valdis Klētnieks
2019-11-04 1:44 ` [PATCH v2 02/10] staging: exfat: Clean up return codes - FFS_MEDIAERR Valdis Kletnieks
2019-11-04 1:44 ` [PATCH v2 03/10] staging: exfat: Clean up return codes - FFS_EOF Valdis Kletnieks
2019-11-04 1:45 ` [PATCH v2 04/10] staging: exfat: Clean up return codes - FFS_INVALIDFID Valdis Kletnieks
2019-11-04 1:45 ` [PATCH v2 05/10] staging: exfat: Clean up return codes - FFS_ERROR Valdis Kletnieks
2019-11-04 1:45 ` [PATCH v2 06/10] staging: exfat: Clean up return codes - remove unused codes Valdis Kletnieks
2019-11-04 1:45 ` [PATCH v2 07/10] staging: exfat: Clean up return codes - FFS_SUCCESS Valdis Kletnieks
2019-11-04 10:04 ` Dan Carpenter
2019-11-04 10:53 ` Valdis Klētnieks
2019-11-04 10:56 ` Dan Carpenter
2019-11-04 1:45 ` [PATCH v2 08/10] staging: exfat: Collapse redundant return code translations Valdis Kletnieks
2019-11-04 1:45 ` [PATCH v2 09/10] staging: exfat: Correct return code Valdis Kletnieks
2019-11-04 1:45 ` [PATCH 10/10] errno.h: Provide EFSCORRUPTED for everybody Valdis Kletnieks
2019-11-04 2:09 ` Gao Xiang
2019-11-05 0:33 ` Christoph Hellwig
2019-11-05 0:54 ` Valdis Klētnieks
2019-11-05 3:43 ` Chao Yu
2019-11-06 21:37 ` Pavel Machek
2019-11-05 16:59 ` [PATCH v2 00/10] staging: exfat: Clean up return codes, revisited Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191105170515.GA2788121@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=devel@driverdev.osuosl.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=valdis.kletnieks@vt.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).