btrfs: remove unnecessary hash_init()
PATCH v2 1/3 btrfs: remove unnecessary hash_init()
DEFINE_HASHTABLE itself has already included initialization code, we don't have to call hash_init() again, so remove it.
---v1->v2:
- Modify change log to explain why hash_init() is not needed.
fs/btrfs/props.c | 2 -- 1 file changed, 2 deletions(-)
fs/btrfs/props.c +0 -2
@@ -437,8 +437,6 @@ void __init btrfs_props_init(void) {int i; -hash_init (prop_handlers_ht); -for (i =0 ; i <ARRAY_SIZE (prop_handlers); i++) {struct prop_handler *p = &prop_handlers[i];u64 h =btrfs_name_hash (p->xattr_name,strlen (p->xattr_name));
Signature · 1 line
2.20.1
PATCH v2 2/3 btrfs: code cleanup for compression type
In order to keep coding style consistency, set BTRFS_NR_COMPRESS_TYPES to the total number of cmpressoin type and fix related calling places.
---v1->v2:
- Modify change log.
- Explicitly specify value for enum.
- Change the BTRFS_COMPRESS_TYPES to BTRFS_NR_COMPRESS_TYPES.
fs/btrfs/compression.c | 2 ++ fs/btrfs/compression.h | 4 ++-- fs/btrfs/ioctl.c | 2 +- fs/btrfs/tree-checker.c | 5 +++-- 4 files changed, 8 insertions(+), 5 deletions(-)
fs/btrfs/compression.c +2 -0
@@ -39,6 +39,8 @@ const char* btrfs_compress_type2str(enum btrfs_compression_type type)case BTRFS_COMPRESS_ZSTD :case BTRFS_COMPRESS_NONE :return btrfs_compress_types[type]; +default : +break ; }return NULL ;
fs/btrfs/compression.h +2 -2
@@ -104,7 +104,7 @@ enum btrfs_compression_type {BTRFS_COMPRESS_ZLIB =1 ,BTRFS_COMPRESS_LZO =2 ,BTRFS_COMPRESS_ZSTD =3 , - BTRFS_COMPRESS_TYPES = 3, + BTRFS_NR_COMPRESS_TYPES = 4, }; struct workspace_manager {
@@ -162,7 +162,7 @@ struct btrfs_compress_op { };/* The heuristic workspaces are managed via the 0th workspace manager */ -#define BTRFS_NR_WORKSPACE_MANAGERS (BTRFS_COMPRESS_TYPES + 1) +#define BTRFS_NR_WORKSPACE_MANAGERS BTRFS_NR_COMPRESS_TYPESextern const struct btrfs_compress_op btrfs_heuristic_compress;extern const struct btrfs_compress_op btrfs_zlib_compress;
fs/btrfs/ioctl.c +1 -1
@@ -1411,7 +1411,7 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,return -EINVAL ;if (do_compress) { -if (range->compress_type >BTRFS_COMPRESS_TYPES ) +if (range->compress_type >=BTRFS_NR_COMPRESS_TYPES )return -EINVAL ;if (range->compress_type) compress_type = range->compress_type;
fs/btrfs/tree-checker.c +3 -2
@@ -155,11 +155,12 @@ static int check_extent_data_item(struct extent_buffer *leaf,* Support for new compression/encryption must introduce incompat flag, * and must be caught in open_ctree(). */ -if (btrfs_file_extent_compression (leaf, fi) >BTRFS_COMPRESS_TYPES ) { +if (btrfs_file_extent_compression (leaf, fi) >= +BTRFS_NR_COMPRESS_TYPES ) {file_extent_err (leaf, slot,"invalid compression for file extent, have %u expect range [0, %u]" ,btrfs_file_extent_compression (leaf, fi), -BTRFS_COMPRESS_TYPES ); +BTRFS_NR_COMPRESS_TYPES -1 );return -EUCLEAN ; }if (btrfs_file_extent_encryption (leaf, fi)) {
Signature · 1 line
2.20.1
PATCH v2 3/3 btrfs: using enum to replace macro
In reply to Chengguang XuUsing enum to replace macro definition
of extent types.
---v1->v2:
- Explicitly specify value for enum.
- Change the name BTRFS_FILE_EXTENT_TYPES to BTRFS_NR_FILE_EXTENT_TYPES.
fs/btrfs/tree-checker.c | 4 ++-- include/uapi/linux/btrfs_tree.h | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-)
fs/btrfs/tree-checker.c +2 -2
@@ -143,11 +143,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
@@ -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 {/*
Signature · 1 line
2.20.1
Quoted 4 lines · Chengguang Xu
DEFINE_HASHTABLEitself has already included initialization code, we don't have to callhash_init()again, so remove it.Signed-off-by Chengguang Xu <[email protected]>
1-3 added to misc-next, with minor updates. Thanks.