UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Chengguang Xu 2019-10-10 15:59:58 +08:00 committed by David Sterba
parent b2cd295964
commit b9b1a53e18
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/tree-checker.c
View File

@ -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); 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, file_extent_err(leaf, slot,
"invalid type for file extent, have %u expect range [0, %u]", "invalid type for file extent, have %u expect range [0, %u]",
btrfs_file_extent_type(leaf, fi), btrfs_file_extent_type(leaf, fi),
BTRFS_FILE_EXTENT_TYPES); BTRFS_NR_FILE_EXTENT_TYPES - 1);
return -EUCLEAN; return -EUCLEAN;
} }

10
include/uapi/linux/btrfs_tree.h
View File

@ -737,10 +737,12 @@ struct btrfs_balance_item {
__le64 unused[4]; __le64 unused[4];
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
#define BTRFS_FILE_EXTENT_INLINE 0 enum {
#define BTRFS_FILE_EXTENT_REG 1 BTRFS_FILE_EXTENT_INLINE = 0,
#define BTRFS_FILE_EXTENT_PREALLOC 2 BTRFS_FILE_EXTENT_REG = 1,
#define BTRFS_FILE_EXTENT_TYPES 2 BTRFS_FILE_EXTENT_PREALLOC = 2,
BTRFS_NR_FILE_EXTENT_TYPES = 3,
};
struct btrfs_file_extent_item { struct btrfs_file_extent_item {
/* /*