Commit b9b1a53e authored Oct 10, 2019 by Chengguang Xu Committed by David Sterba Nov 18, 2019

btrfs: use enum for extent type defines



Use enum to replace macro definitions of extent types.

Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent b2cd2959

fs/btrfs/tree-checker.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -221,11 +221,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_NR_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_NR_FILE_EXTENT_TYPES - 1);
		return -EUCLEAN;
		}

include/uapi/linux/btrfs_tree.h

+6 −4

Original line number	Diff line number	Diff line
		@@ -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 = 0,
		BTRFS_FILE_EXTENT_REG = 1,
		BTRFS_FILE_EXTENT_PREALLOC = 2,
		BTRFS_NR_FILE_EXTENT_TYPES = 3,
		};

		struct btrfs_file_extent_item {
		/*