From: David Sterba <dsterba@suse.cz>
To: Chengguang Xu <cgxu519@mykernel.net>
Cc: clm@fb.com, josef@toxicpanda.com, dsterba@suse.com,
linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 3/3] btrfs: using enum to replace macro
Date: Mon, 7 Oct 2019 01:29:28 +0200 [thread overview]
Message-ID: <20191006232928.GZ2751@twin.jikos.cz> (raw)
In-Reply-To: <20191005051736.29857-3-cgxu519@mykernel.net>
On Sat, Oct 05, 2019 at 01:17:36PM +0800, Chengguang Xu wrote:
> using enum to replace macro definition for extent
> types.
>
> Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
> ---
> fs/btrfs/tree-checker.c | 4 ++--
> include/uapi/linux/btrfs_tree.h | 10 ++++++----
> 2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
> index 2d91c34bbf63..9b0c5fdbe04e 100644
> --- a/fs/btrfs/tree-checker.c
> +++ b/fs/btrfs/tree-checker.c
> @@ -156,11 +156,11 @@ static int check_extent_data_item(struct extent_buffer *leaf,
>
> fi = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item);
>
> - if (btrfs_file_extent_type(leaf, fi) > BTRFS_FILE_EXTENT_TYPES) {
> + if (btrfs_file_extent_type(leaf, fi) >= BTRFS_FILE_EXTENT_TYPES) {
> file_extent_err(leaf, slot,
> "invalid type for file extent, have %u expect range [0, %u]",
> btrfs_file_extent_type(leaf, fi),
> - BTRFS_FILE_EXTENT_TYPES);
> + BTRFS_FILE_EXTENT_TYPES - 1);
> return -EUCLEAN;
> }
>
> diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h
> index b65c7ee75bc7..34bd09ffc71d 100644
> --- a/include/uapi/linux/btrfs_tree.h
> +++ b/include/uapi/linux/btrfs_tree.h
> @@ -737,10 +737,12 @@ struct btrfs_balance_item {
> __le64 unused[4];
> } __attribute__ ((__packed__));
>
> -#define BTRFS_FILE_EXTENT_INLINE 0
> -#define BTRFS_FILE_EXTENT_REG 1
> -#define BTRFS_FILE_EXTENT_PREALLOC 2
> -#define BTRFS_FILE_EXTENT_TYPES 2
> +enum {
> + BTRFS_FILE_EXTENT_INLINE,
> + BTRFS_FILE_EXTENT_REG,
> + BTRFS_FILE_EXTENT_PREALLOC,
> + BTRFS_FILE_EXTENT_TYPES
> +};
As stated before, using enums is fine and for on-disk structure,s the
explicit value should be specified as well.
> struct btrfs_file_extent_item {
> /*
> --
> 2.21.0
>
>
>
next prev parent reply other threads:[~2019-10-06 23:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-05 5:17 [PATCH 1/3] btrfs: remove unnecessary hash_init() Chengguang Xu
2019-10-05 5:17 ` [PATCH 2/3] btrfs: code cleanup for compression type Chengguang Xu
2019-10-06 23:28 ` David Sterba
2019-10-07 13:47 ` Chengguang Xu
2019-10-05 5:17 ` [PATCH 3/3] btrfs: using enum to replace macro Chengguang Xu
2019-10-06 23:29 ` David Sterba [this message]
2019-10-07 15:44 ` [PATCH 1/3] btrfs: remove unnecessary hash_init() David Sterba
2019-10-08 2:56 ` Chengguang Xu
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=20191006232928.GZ2751@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=cgxu519@mykernel.net \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=josef@toxicpanda.com \
--cc=linux-btrfs@vger.kernel.org \
/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).