mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2026-01-27 12:47:24 +01:00
btrfs: convert several int parameters to bool
We're almost done cleaning misused int/bool parameters. Convert a bunch of them, found by manual grepping. Note that btrfs_sync_fs() needs an int as it's mandated by the struct super_operations prototype. Reviewed-by: Boris Burkov <boris@bur.io> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
cba7c35fec
commit
67e78f983e
|
|
@ -1358,7 +1358,7 @@ struct btrfs_trans_handle *btrfs_start_trans_remove_block_group(
|
||||||
* data in this block group. That check should be done by relocation routine,
|
* data in this block group. That check should be done by relocation routine,
|
||||||
* not this function.
|
* not this function.
|
||||||
*/
|
*/
|
||||||
static int inc_block_group_ro(struct btrfs_block_group *cache, int force)
|
static int inc_block_group_ro(struct btrfs_block_group *cache, bool force)
|
||||||
{
|
{
|
||||||
struct btrfs_space_info *sinfo = cache->space_info;
|
struct btrfs_space_info *sinfo = cache->space_info;
|
||||||
u64 num_bytes;
|
u64 num_bytes;
|
||||||
|
|
|
||||||
|
|
@ -558,7 +558,7 @@ int btrfs_unlink_inode(struct btrfs_trans_handle *trans,
|
||||||
const struct fscrypt_str *name);
|
const struct fscrypt_str *name);
|
||||||
int btrfs_add_link(struct btrfs_trans_handle *trans,
|
int btrfs_add_link(struct btrfs_trans_handle *trans,
|
||||||
struct btrfs_inode *parent_inode, struct btrfs_inode *inode,
|
struct btrfs_inode *parent_inode, struct btrfs_inode *inode,
|
||||||
const struct fscrypt_str *name, int add_backref, u64 index);
|
const struct fscrypt_str *name, bool add_backref, u64 index);
|
||||||
int btrfs_delete_subvolume(struct btrfs_inode *dir, struct dentry *dentry);
|
int btrfs_delete_subvolume(struct btrfs_inode *dir, struct dentry *dentry);
|
||||||
int btrfs_truncate_block(struct btrfs_inode *inode, u64 offset, u64 start, u64 end);
|
int btrfs_truncate_block(struct btrfs_inode *inode, u64 offset, u64 start, u64 end);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,10 +30,10 @@ static int split_node(struct btrfs_trans_handle *trans, struct btrfs_root
|
||||||
*root, struct btrfs_path *path, int level);
|
*root, struct btrfs_path *path, int level);
|
||||||
static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root *root,
|
static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root *root,
|
||||||
const struct btrfs_key *ins_key, struct btrfs_path *path,
|
const struct btrfs_key *ins_key, struct btrfs_path *path,
|
||||||
int data_size, int extend);
|
int data_size, bool extend);
|
||||||
static int push_node_left(struct btrfs_trans_handle *trans,
|
static int push_node_left(struct btrfs_trans_handle *trans,
|
||||||
struct extent_buffer *dst,
|
struct extent_buffer *dst,
|
||||||
struct extent_buffer *src, int empty);
|
struct extent_buffer *src, bool empty);
|
||||||
static int balance_node_right(struct btrfs_trans_handle *trans,
|
static int balance_node_right(struct btrfs_trans_handle *trans,
|
||||||
struct extent_buffer *dst_buf,
|
struct extent_buffer *dst_buf,
|
||||||
struct extent_buffer *src_buf);
|
struct extent_buffer *src_buf);
|
||||||
|
|
@ -1484,7 +1484,7 @@ read_block_for_search(struct btrfs_root *root, struct btrfs_path *p,
|
||||||
reada_for_search(fs_info, p, parent_level, slot, key->objectid);
|
reada_for_search(fs_info, p, parent_level, slot, key->objectid);
|
||||||
|
|
||||||
/* first we do an atomic uptodate check */
|
/* first we do an atomic uptodate check */
|
||||||
if (btrfs_buffer_uptodate(tmp, check.transid, 1) > 0) {
|
if (btrfs_buffer_uptodate(tmp, check.transid, true) > 0) {
|
||||||
/*
|
/*
|
||||||
* Do extra check for first_key, eb can be stale due to
|
* Do extra check for first_key, eb can be stale due to
|
||||||
* being cached, read from scrub, or have multiple
|
* being cached, read from scrub, or have multiple
|
||||||
|
|
@ -2686,7 +2686,7 @@ static bool check_sibling_keys(const struct extent_buffer *left,
|
||||||
*/
|
*/
|
||||||
static int push_node_left(struct btrfs_trans_handle *trans,
|
static int push_node_left(struct btrfs_trans_handle *trans,
|
||||||
struct extent_buffer *dst,
|
struct extent_buffer *dst,
|
||||||
struct extent_buffer *src, int empty)
|
struct extent_buffer *src, bool empty)
|
||||||
{
|
{
|
||||||
struct btrfs_fs_info *fs_info = trans->fs_info;
|
struct btrfs_fs_info *fs_info = trans->fs_info;
|
||||||
int push_items = 0;
|
int push_items = 0;
|
||||||
|
|
@ -3102,7 +3102,7 @@ int btrfs_leaf_free_space(const struct extent_buffer *leaf)
|
||||||
*/
|
*/
|
||||||
static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,
|
static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,
|
||||||
struct btrfs_path *path,
|
struct btrfs_path *path,
|
||||||
int data_size, int empty,
|
int data_size, bool empty,
|
||||||
struct extent_buffer *right,
|
struct extent_buffer *right,
|
||||||
int free_space, u32 left_nritems,
|
int free_space, u32 left_nritems,
|
||||||
u32 min_slot)
|
u32 min_slot)
|
||||||
|
|
@ -3239,7 +3239,7 @@ out_unlock:
|
||||||
static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
|
static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root
|
||||||
*root, struct btrfs_path *path,
|
*root, struct btrfs_path *path,
|
||||||
int min_data_size, int data_size,
|
int min_data_size, int data_size,
|
||||||
int empty, u32 min_slot)
|
bool empty, u32 min_slot)
|
||||||
{
|
{
|
||||||
struct extent_buffer *left = path->nodes[0];
|
struct extent_buffer *left = path->nodes[0];
|
||||||
struct extent_buffer *right;
|
struct extent_buffer *right;
|
||||||
|
|
@ -3316,7 +3316,7 @@ out_unlock:
|
||||||
*/
|
*/
|
||||||
static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,
|
static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,
|
||||||
struct btrfs_path *path, int data_size,
|
struct btrfs_path *path, int data_size,
|
||||||
int empty, struct extent_buffer *left,
|
bool empty, struct extent_buffer *left,
|
||||||
int free_space, u32 right_nritems,
|
int free_space, u32 right_nritems,
|
||||||
u32 max_slot)
|
u32 max_slot)
|
||||||
{
|
{
|
||||||
|
|
@ -3642,7 +3642,7 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans,
|
||||||
struct btrfs_root *root,
|
struct btrfs_root *root,
|
||||||
const struct btrfs_key *ins_key,
|
const struct btrfs_key *ins_key,
|
||||||
struct btrfs_path *path, int data_size,
|
struct btrfs_path *path, int data_size,
|
||||||
int extend)
|
bool extend)
|
||||||
{
|
{
|
||||||
struct btrfs_disk_key disk_key;
|
struct btrfs_disk_key disk_key;
|
||||||
struct extent_buffer *l;
|
struct extent_buffer *l;
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ static void csum_tree_block(struct extent_buffer *buf, u8 *result)
|
||||||
* detect blocks that either didn't get written at all or got written
|
* detect blocks that either didn't get written at all or got written
|
||||||
* in the wrong place.
|
* in the wrong place.
|
||||||
*/
|
*/
|
||||||
int btrfs_buffer_uptodate(struct extent_buffer *eb, u64 parent_transid, int atomic)
|
int btrfs_buffer_uptodate(struct extent_buffer *eb, u64 parent_transid, bool atomic)
|
||||||
{
|
{
|
||||||
if (!extent_buffer_uptodate(eb))
|
if (!extent_buffer_uptodate(eb))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
@ -1047,7 +1047,7 @@ static struct btrfs_root *read_tree_root_path(struct btrfs_root *tree_root,
|
||||||
root->node = NULL;
|
root->node = NULL;
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
if (!btrfs_buffer_uptodate(root->node, generation, 0)) {
|
if (!btrfs_buffer_uptodate(root->node, generation, false)) {
|
||||||
ret = -EIO;
|
ret = -EIO;
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -106,8 +106,7 @@ static inline struct btrfs_root *btrfs_grab_root(struct btrfs_root *root)
|
||||||
void btrfs_put_root(struct btrfs_root *root);
|
void btrfs_put_root(struct btrfs_root *root);
|
||||||
void btrfs_mark_buffer_dirty(struct btrfs_trans_handle *trans,
|
void btrfs_mark_buffer_dirty(struct btrfs_trans_handle *trans,
|
||||||
struct extent_buffer *buf);
|
struct extent_buffer *buf);
|
||||||
int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid,
|
int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid, bool atomic);
|
||||||
int atomic);
|
|
||||||
int btrfs_read_extent_buffer(struct extent_buffer *buf,
|
int btrfs_read_extent_buffer(struct extent_buffer *buf,
|
||||||
const struct btrfs_tree_parent_check *check);
|
const struct btrfs_tree_parent_check *check);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1664,7 +1664,7 @@ out:
|
||||||
*/
|
*/
|
||||||
u64 btrfs_count_range_bits(struct extent_io_tree *tree,
|
u64 btrfs_count_range_bits(struct extent_io_tree *tree,
|
||||||
u64 *start, u64 search_end, u64 max_bytes,
|
u64 *start, u64 search_end, u64 max_bytes,
|
||||||
u32 bits, int contig,
|
u32 bits, bool contig,
|
||||||
struct extent_state **cached_state)
|
struct extent_state **cached_state)
|
||||||
{
|
{
|
||||||
struct extent_state *state = NULL;
|
struct extent_state *state = NULL;
|
||||||
|
|
|
||||||
|
|
@ -163,7 +163,7 @@ void __cold btrfs_extent_state_free_cachep(void);
|
||||||
|
|
||||||
u64 btrfs_count_range_bits(struct extent_io_tree *tree,
|
u64 btrfs_count_range_bits(struct extent_io_tree *tree,
|
||||||
u64 *start, u64 search_end,
|
u64 *start, u64 search_end,
|
||||||
u64 max_bytes, u32 bits, int contig,
|
u64 max_bytes, u32 bits, bool contig,
|
||||||
struct extent_state **cached_state);
|
struct extent_state **cached_state);
|
||||||
|
|
||||||
void btrfs_free_extent_state(struct extent_state *state);
|
void btrfs_free_extent_state(struct extent_state *state);
|
||||||
|
|
|
||||||
|
|
@ -2457,7 +2457,7 @@ out:
|
||||||
static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
|
static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
|
||||||
struct btrfs_root *root,
|
struct btrfs_root *root,
|
||||||
struct extent_buffer *buf,
|
struct extent_buffer *buf,
|
||||||
int full_backref, int inc)
|
bool full_backref, bool inc)
|
||||||
{
|
{
|
||||||
struct btrfs_fs_info *fs_info = root->fs_info;
|
struct btrfs_fs_info *fs_info = root->fs_info;
|
||||||
u64 parent;
|
u64 parent;
|
||||||
|
|
@ -2543,15 +2543,15 @@ fail:
|
||||||
}
|
}
|
||||||
|
|
||||||
int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
|
int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
|
||||||
struct extent_buffer *buf, int full_backref)
|
struct extent_buffer *buf, bool full_backref)
|
||||||
{
|
{
|
||||||
return __btrfs_mod_ref(trans, root, buf, full_backref, 1);
|
return __btrfs_mod_ref(trans, root, buf, full_backref, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
|
int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
|
||||||
struct extent_buffer *buf, int full_backref)
|
struct extent_buffer *buf, bool full_backref)
|
||||||
{
|
{
|
||||||
return __btrfs_mod_ref(trans, root, buf, full_backref, 0);
|
return __btrfs_mod_ref(trans, root, buf, full_backref, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
static u64 get_alloc_profile_by_root(struct btrfs_root *root, int data)
|
static u64 get_alloc_profile_by_root(struct btrfs_root *root, int data)
|
||||||
|
|
@ -5584,7 +5584,7 @@ static int check_next_block_uptodate(struct btrfs_trans_handle *trans,
|
||||||
|
|
||||||
generation = btrfs_node_ptr_generation(path->nodes[level], path->slots[level]);
|
generation = btrfs_node_ptr_generation(path->nodes[level], path->slots[level]);
|
||||||
|
|
||||||
if (btrfs_buffer_uptodate(next, generation, 0))
|
if (btrfs_buffer_uptodate(next, generation, false))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
check.level = level - 1;
|
check.level = level - 1;
|
||||||
|
|
@ -6051,9 +6051,9 @@ static noinline int walk_up_tree(struct btrfs_trans_handle *trans,
|
||||||
* also make sure backrefs for the shared block and all lower level
|
* also make sure backrefs for the shared block and all lower level
|
||||||
* blocks are properly updated.
|
* blocks are properly updated.
|
||||||
*
|
*
|
||||||
* If called with for_reloc == 0, may exit early with -EAGAIN
|
* If called with for_reloc set, may exit early with -EAGAIN
|
||||||
*/
|
*/
|
||||||
int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref, int for_reloc)
|
int btrfs_drop_snapshot(struct btrfs_root *root, bool update_ref, bool for_reloc)
|
||||||
{
|
{
|
||||||
const bool is_reloc_root = (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID);
|
const bool is_reloc_root = (btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID);
|
||||||
struct btrfs_fs_info *fs_info = root->fs_info;
|
struct btrfs_fs_info *fs_info = root->fs_info;
|
||||||
|
|
|
||||||
|
|
@ -140,9 +140,9 @@ int btrfs_reserve_extent(struct btrfs_root *root, u64 ram_bytes, u64 num_bytes,
|
||||||
u64 min_alloc_size, u64 empty_size, u64 hint_byte,
|
u64 min_alloc_size, u64 empty_size, u64 hint_byte,
|
||||||
struct btrfs_key *ins, int is_data, int delalloc);
|
struct btrfs_key *ins, int is_data, int delalloc);
|
||||||
int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
|
int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
|
||||||
struct extent_buffer *buf, int full_backref);
|
struct extent_buffer *buf, bool full_backref);
|
||||||
int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
|
int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
|
||||||
struct extent_buffer *buf, int full_backref);
|
struct extent_buffer *buf, bool full_backref);
|
||||||
int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans,
|
int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans,
|
||||||
struct extent_buffer *eb, u64 flags);
|
struct extent_buffer *eb, u64 flags);
|
||||||
int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref);
|
int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref);
|
||||||
|
|
@ -155,8 +155,7 @@ int btrfs_pin_reserved_extent(struct btrfs_trans_handle *trans,
|
||||||
const struct extent_buffer *eb);
|
const struct extent_buffer *eb);
|
||||||
int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans);
|
int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans);
|
||||||
int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, struct btrfs_ref *generic_ref);
|
int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, struct btrfs_ref *generic_ref);
|
||||||
int btrfs_drop_snapshot(struct btrfs_root *root, int update_ref,
|
int btrfs_drop_snapshot(struct btrfs_root *root, bool update_ref, bool for_reloc);
|
||||||
int for_reloc);
|
|
||||||
int btrfs_drop_subtree(struct btrfs_trans_handle *trans,
|
int btrfs_drop_subtree(struct btrfs_trans_handle *trans,
|
||||||
struct btrfs_root *root,
|
struct btrfs_root *root,
|
||||||
struct extent_buffer *node,
|
struct extent_buffer *node,
|
||||||
|
|
|
||||||
|
|
@ -4543,7 +4543,7 @@ void btrfs_readahead_tree_block(struct btrfs_fs_info *fs_info,
|
||||||
if (IS_ERR(eb))
|
if (IS_ERR(eb))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (btrfs_buffer_uptodate(eb, gen, 1)) {
|
if (btrfs_buffer_uptodate(eb, gen, true)) {
|
||||||
free_extent_buffer(eb);
|
free_extent_buffer(eb);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -460,7 +460,7 @@ void btrfs_clear_em_logging(struct btrfs_inode *inode, struct extent_map *em)
|
||||||
|
|
||||||
static inline void setup_extent_mapping(struct btrfs_inode *inode,
|
static inline void setup_extent_mapping(struct btrfs_inode *inode,
|
||||||
struct extent_map *em,
|
struct extent_map *em,
|
||||||
int modified)
|
bool modified)
|
||||||
{
|
{
|
||||||
refcount_inc(&em->refs);
|
refcount_inc(&em->refs);
|
||||||
|
|
||||||
|
|
@ -486,7 +486,7 @@ static inline void setup_extent_mapping(struct btrfs_inode *inode,
|
||||||
* taken, or a reference dropped if the merge attempt was successful.
|
* taken, or a reference dropped if the merge attempt was successful.
|
||||||
*/
|
*/
|
||||||
static int add_extent_mapping(struct btrfs_inode *inode,
|
static int add_extent_mapping(struct btrfs_inode *inode,
|
||||||
struct extent_map *em, int modified)
|
struct extent_map *em, bool modified)
|
||||||
{
|
{
|
||||||
struct extent_map_tree *tree = &inode->extent_tree;
|
struct extent_map_tree *tree = &inode->extent_tree;
|
||||||
struct btrfs_root *root = inode->root;
|
struct btrfs_root *root = inode->root;
|
||||||
|
|
@ -509,7 +509,7 @@ static int add_extent_mapping(struct btrfs_inode *inode,
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct extent_map *lookup_extent_mapping(struct extent_map_tree *tree,
|
static struct extent_map *lookup_extent_mapping(struct extent_map_tree *tree,
|
||||||
u64 start, u64 len, int strict)
|
u64 start, u64 len, bool strict)
|
||||||
{
|
{
|
||||||
struct extent_map *em;
|
struct extent_map *em;
|
||||||
struct rb_node *rb_node;
|
struct rb_node *rb_node;
|
||||||
|
|
@ -548,7 +548,7 @@ static struct extent_map *lookup_extent_mapping(struct extent_map_tree *tree,
|
||||||
struct extent_map *btrfs_lookup_extent_mapping(struct extent_map_tree *tree,
|
struct extent_map *btrfs_lookup_extent_mapping(struct extent_map_tree *tree,
|
||||||
u64 start, u64 len)
|
u64 start, u64 len)
|
||||||
{
|
{
|
||||||
return lookup_extent_mapping(tree, start, len, 1);
|
return lookup_extent_mapping(tree, start, len, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -566,7 +566,7 @@ struct extent_map *btrfs_lookup_extent_mapping(struct extent_map_tree *tree,
|
||||||
struct extent_map *btrfs_search_extent_mapping(struct extent_map_tree *tree,
|
struct extent_map *btrfs_search_extent_mapping(struct extent_map_tree *tree,
|
||||||
u64 start, u64 len)
|
u64 start, u64 len)
|
||||||
{
|
{
|
||||||
return lookup_extent_mapping(tree, start, len, 0);
|
return lookup_extent_mapping(tree, start, len, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -594,7 +594,7 @@ void btrfs_remove_extent_mapping(struct btrfs_inode *inode, struct extent_map *e
|
||||||
static void replace_extent_mapping(struct btrfs_inode *inode,
|
static void replace_extent_mapping(struct btrfs_inode *inode,
|
||||||
struct extent_map *cur,
|
struct extent_map *cur,
|
||||||
struct extent_map *new,
|
struct extent_map *new,
|
||||||
int modified)
|
bool modified)
|
||||||
{
|
{
|
||||||
struct btrfs_fs_info *fs_info = inode->root->fs_info;
|
struct btrfs_fs_info *fs_info = inode->root->fs_info;
|
||||||
struct extent_map_tree *tree = &inode->extent_tree;
|
struct extent_map_tree *tree = &inode->extent_tree;
|
||||||
|
|
@ -670,7 +670,7 @@ static noinline int merge_extent_mapping(struct btrfs_inode *inode,
|
||||||
em->len = end - start;
|
em->len = end - start;
|
||||||
if (em->disk_bytenr < EXTENT_MAP_LAST_BYTE)
|
if (em->disk_bytenr < EXTENT_MAP_LAST_BYTE)
|
||||||
em->offset += start_diff;
|
em->offset += start_diff;
|
||||||
return add_extent_mapping(inode, em, 0);
|
return add_extent_mapping(inode, em, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -707,7 +707,7 @@ int btrfs_add_extent_mapping(struct btrfs_inode *inode,
|
||||||
if (em->disk_bytenr == EXTENT_MAP_INLINE)
|
if (em->disk_bytenr == EXTENT_MAP_INLINE)
|
||||||
ASSERT(em->start == 0);
|
ASSERT(em->start == 0);
|
||||||
|
|
||||||
ret = add_extent_mapping(inode, em, 0);
|
ret = add_extent_mapping(inode, em, false);
|
||||||
/* it is possible that someone inserted the extent into the tree
|
/* it is possible that someone inserted the extent into the tree
|
||||||
* while we had the lock dropped. It is also possible that
|
* while we had the lock dropped. It is also possible that
|
||||||
* an overlapping map exists in the tree
|
* an overlapping map exists in the tree
|
||||||
|
|
@ -1082,7 +1082,7 @@ int btrfs_split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pr
|
||||||
split_pre->flags = flags;
|
split_pre->flags = flags;
|
||||||
split_pre->generation = em->generation;
|
split_pre->generation = em->generation;
|
||||||
|
|
||||||
replace_extent_mapping(inode, em, split_pre, 1);
|
replace_extent_mapping(inode, em, split_pre, true);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Now we only have an extent_map at:
|
* Now we only have an extent_map at:
|
||||||
|
|
@ -1098,7 +1098,7 @@ int btrfs_split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pr
|
||||||
split_mid->ram_bytes = split_mid->len;
|
split_mid->ram_bytes = split_mid->len;
|
||||||
split_mid->flags = flags;
|
split_mid->flags = flags;
|
||||||
split_mid->generation = em->generation;
|
split_mid->generation = em->generation;
|
||||||
add_extent_mapping(inode, split_mid, 1);
|
add_extent_mapping(inode, split_mid, true);
|
||||||
|
|
||||||
/* Once for us */
|
/* Once for us */
|
||||||
btrfs_free_extent_map(em);
|
btrfs_free_extent_map(em);
|
||||||
|
|
|
||||||
|
|
@ -6671,7 +6671,7 @@ out:
|
||||||
*/
|
*/
|
||||||
int btrfs_add_link(struct btrfs_trans_handle *trans,
|
int btrfs_add_link(struct btrfs_trans_handle *trans,
|
||||||
struct btrfs_inode *parent_inode, struct btrfs_inode *inode,
|
struct btrfs_inode *parent_inode, struct btrfs_inode *inode,
|
||||||
const struct fscrypt_str *name, int add_backref, u64 index)
|
const struct fscrypt_str *name, bool add_backref, u64 index)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
struct btrfs_key key;
|
struct btrfs_key key;
|
||||||
|
|
|
||||||
|
|
@ -1251,7 +1251,7 @@ out:
|
||||||
}
|
}
|
||||||
|
|
||||||
static noinline int btrfs_ioctl_snap_create(struct file *file,
|
static noinline int btrfs_ioctl_snap_create(struct file *file,
|
||||||
void __user *arg, int subvol)
|
void __user *arg, bool subvol)
|
||||||
{
|
{
|
||||||
struct btrfs_ioctl_vol_args *vol_args;
|
struct btrfs_ioctl_vol_args *vol_args;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
@ -5223,13 +5223,13 @@ long btrfs_ioctl(struct file *file, unsigned int
|
||||||
case FITRIM:
|
case FITRIM:
|
||||||
return btrfs_ioctl_fitrim(fs_info, argp);
|
return btrfs_ioctl_fitrim(fs_info, argp);
|
||||||
case BTRFS_IOC_SNAP_CREATE:
|
case BTRFS_IOC_SNAP_CREATE:
|
||||||
return btrfs_ioctl_snap_create(file, argp, 0);
|
return btrfs_ioctl_snap_create(file, argp, false);
|
||||||
case BTRFS_IOC_SNAP_CREATE_V2:
|
case BTRFS_IOC_SNAP_CREATE_V2:
|
||||||
return btrfs_ioctl_snap_create_v2(file, argp, 0);
|
return btrfs_ioctl_snap_create_v2(file, argp, false);
|
||||||
case BTRFS_IOC_SUBVOL_CREATE:
|
case BTRFS_IOC_SUBVOL_CREATE:
|
||||||
return btrfs_ioctl_snap_create(file, argp, 1);
|
return btrfs_ioctl_snap_create(file, argp, true);
|
||||||
case BTRFS_IOC_SUBVOL_CREATE_V2:
|
case BTRFS_IOC_SUBVOL_CREATE_V2:
|
||||||
return btrfs_ioctl_snap_create_v2(file, argp, 1);
|
return btrfs_ioctl_snap_create_v2(file, argp, true);
|
||||||
case BTRFS_IOC_SNAP_DESTROY:
|
case BTRFS_IOC_SNAP_DESTROY:
|
||||||
return btrfs_ioctl_snap_destroy(file, argp, false);
|
return btrfs_ioctl_snap_destroy(file, argp, false);
|
||||||
case BTRFS_IOC_SNAP_DESTROY_V2:
|
case BTRFS_IOC_SNAP_DESTROY_V2:
|
||||||
|
|
|
||||||
|
|
@ -2729,7 +2729,7 @@ static void qgroup_iterator_nested_clean(struct list_head *head)
|
||||||
*/
|
*/
|
||||||
static void qgroup_update_refcnt(struct btrfs_fs_info *fs_info,
|
static void qgroup_update_refcnt(struct btrfs_fs_info *fs_info,
|
||||||
struct ulist *roots, struct list_head *qgroups,
|
struct ulist *roots, struct list_head *qgroups,
|
||||||
u64 seq, int update_old)
|
u64 seq, bool update_old)
|
||||||
{
|
{
|
||||||
struct ulist_node *unode;
|
struct ulist_node *unode;
|
||||||
struct ulist_iterator uiter;
|
struct ulist_iterator uiter;
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans,
|
||||||
u64 endoff,
|
u64 endoff,
|
||||||
const u64 destoff,
|
const u64 destoff,
|
||||||
const u64 olen,
|
const u64 olen,
|
||||||
int no_time_update)
|
bool no_time_update)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
|
@ -337,7 +337,7 @@ copy_to_page:
|
||||||
*/
|
*/
|
||||||
static int btrfs_clone(struct inode *src, struct inode *inode,
|
static int btrfs_clone(struct inode *src, struct inode *inode,
|
||||||
const u64 off, const u64 olen, const u64 olen_aligned,
|
const u64 off, const u64 olen, const u64 olen_aligned,
|
||||||
const u64 destoff, int no_time_update)
|
const u64 destoff, bool no_time_update)
|
||||||
{
|
{
|
||||||
struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);
|
struct btrfs_fs_info *fs_info = inode_to_fs_info(inode);
|
||||||
struct btrfs_path *path = NULL;
|
struct btrfs_path *path = NULL;
|
||||||
|
|
|
||||||
|
|
@ -1490,7 +1490,7 @@ static int clean_dirty_subvols(struct reloc_control *rc)
|
||||||
* ->reloc_root. If it fails however we must
|
* ->reloc_root. If it fails however we must
|
||||||
* drop the ref ourselves.
|
* drop the ref ourselves.
|
||||||
*/
|
*/
|
||||||
ret2 = btrfs_drop_snapshot(reloc_root, 0, 1);
|
ret2 = btrfs_drop_snapshot(reloc_root, false, true);
|
||||||
if (ret2 < 0) {
|
if (ret2 < 0) {
|
||||||
btrfs_put_root(reloc_root);
|
btrfs_put_root(reloc_root);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
|
|
@ -1500,7 +1500,7 @@ static int clean_dirty_subvols(struct reloc_control *rc)
|
||||||
btrfs_put_root(root);
|
btrfs_put_root(root);
|
||||||
} else {
|
} else {
|
||||||
/* Orphan reloc tree, just clean it up */
|
/* Orphan reloc tree, just clean it up */
|
||||||
ret2 = btrfs_drop_snapshot(root, 0, 1);
|
ret2 = btrfs_drop_snapshot(root, false, true);
|
||||||
if (ret2 < 0) {
|
if (ret2 < 0) {
|
||||||
btrfs_put_root(root);
|
btrfs_put_root(root);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
|
|
|
||||||
|
|
@ -206,7 +206,7 @@ struct scrub_ctx {
|
||||||
ktime_t throttle_deadline;
|
ktime_t throttle_deadline;
|
||||||
u64 throttle_sent;
|
u64 throttle_sent;
|
||||||
|
|
||||||
int is_dev_replace;
|
bool is_dev_replace;
|
||||||
u64 write_pointer;
|
u64 write_pointer;
|
||||||
|
|
||||||
struct mutex wr_lock;
|
struct mutex wr_lock;
|
||||||
|
|
@ -446,7 +446,7 @@ static void scrub_put_ctx(struct scrub_ctx *sctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
static noinline_for_stack struct scrub_ctx *scrub_setup_ctx(
|
static noinline_for_stack struct scrub_ctx *scrub_setup_ctx(
|
||||||
struct btrfs_fs_info *fs_info, int is_dev_replace)
|
struct btrfs_fs_info *fs_info, bool is_dev_replace)
|
||||||
{
|
{
|
||||||
struct scrub_ctx *sctx;
|
struct scrub_ctx *sctx;
|
||||||
int i;
|
int i;
|
||||||
|
|
@ -3013,7 +3013,7 @@ static noinline_for_stack int scrub_workers_get(struct btrfs_fs_info *fs_info)
|
||||||
|
|
||||||
int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
|
int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
|
||||||
u64 end, struct btrfs_scrub_progress *progress,
|
u64 end, struct btrfs_scrub_progress *progress,
|
||||||
int readonly, int is_dev_replace)
|
bool readonly, bool is_dev_replace)
|
||||||
{
|
{
|
||||||
struct btrfs_dev_lookup_args args = { .devid = devid };
|
struct btrfs_dev_lookup_args args = { .devid = devid };
|
||||||
struct scrub_ctx *sctx;
|
struct scrub_ctx *sctx;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ struct btrfs_scrub_progress;
|
||||||
|
|
||||||
int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
|
int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
|
||||||
u64 end, struct btrfs_scrub_progress *progress,
|
u64 end, struct btrfs_scrub_progress *progress,
|
||||||
int readonly, int is_dev_replace);
|
bool readonly, bool is_dev_replace);
|
||||||
void btrfs_scrub_pause(struct btrfs_fs_info *fs_info);
|
void btrfs_scrub_pause(struct btrfs_fs_info *fs_info);
|
||||||
void btrfs_scrub_continue(struct btrfs_fs_info *fs_info);
|
void btrfs_scrub_continue(struct btrfs_fs_info *fs_info);
|
||||||
int btrfs_scrub_cancel(struct btrfs_fs_info *info);
|
int btrfs_scrub_cancel(struct btrfs_fs_info *info);
|
||||||
|
|
|
||||||
|
|
@ -973,7 +973,7 @@ typedef int (*iterate_inode_ref_t)(u64 dir, struct fs_path *p, void *ctx);
|
||||||
* path must point to the INODE_REF or INODE_EXTREF when called.
|
* path must point to the INODE_REF or INODE_EXTREF when called.
|
||||||
*/
|
*/
|
||||||
static int iterate_inode_ref(struct btrfs_root *root, struct btrfs_path *path,
|
static int iterate_inode_ref(struct btrfs_root *root, struct btrfs_path *path,
|
||||||
struct btrfs_key *found_key, int resolve,
|
struct btrfs_key *found_key, bool resolve,
|
||||||
iterate_inode_ref_t iterate, void *ctx)
|
iterate_inode_ref_t iterate, void *ctx)
|
||||||
{
|
{
|
||||||
struct extent_buffer *eb = path->nodes[0];
|
struct extent_buffer *eb = path->nodes[0];
|
||||||
|
|
@ -1251,8 +1251,7 @@ static int get_inode_path(struct btrfs_root *root,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = iterate_inode_ref(root, p, &found_key, 1,
|
ret = iterate_inode_ref(root, p, &found_key, true, __copy_first_ref, path);
|
||||||
__copy_first_ref, path);
|
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto out;
|
goto out;
|
||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
@ -4756,8 +4755,8 @@ static int record_new_ref(struct send_ctx *sctx)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = iterate_inode_ref(sctx->send_root, sctx->left_path,
|
ret = iterate_inode_ref(sctx->send_root, sctx->left_path, sctx->cmp_key,
|
||||||
sctx->cmp_key, 0, record_new_ref_if_needed, sctx);
|
false, record_new_ref_if_needed, sctx);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
@ -4768,9 +4767,8 @@ static int record_deleted_ref(struct send_ctx *sctx)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = iterate_inode_ref(sctx->parent_root, sctx->right_path,
|
ret = iterate_inode_ref(sctx->parent_root, sctx->right_path, sctx->cmp_key,
|
||||||
sctx->cmp_key, 0, record_deleted_ref_if_needed,
|
false, record_deleted_ref_if_needed, sctx);
|
||||||
sctx);
|
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
@ -4781,12 +4779,12 @@ static int record_changed_ref(struct send_ctx *sctx)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = iterate_inode_ref(sctx->send_root, sctx->left_path,
|
ret = iterate_inode_ref(sctx->send_root, sctx->left_path, sctx->cmp_key,
|
||||||
sctx->cmp_key, 0, record_new_ref_if_needed, sctx);
|
false, record_new_ref_if_needed, sctx);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
ret = iterate_inode_ref(sctx->parent_root, sctx->right_path,
|
ret = iterate_inode_ref(sctx->parent_root, sctx->right_path, sctx->cmp_key,
|
||||||
sctx->cmp_key, 0, record_deleted_ref_if_needed, sctx);
|
false, record_deleted_ref_if_needed, sctx);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
@ -4835,7 +4833,7 @@ static int process_all_refs(struct send_ctx *sctx,
|
||||||
found_key.type != BTRFS_INODE_EXTREF_KEY))
|
found_key.type != BTRFS_INODE_EXTREF_KEY))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
ret = iterate_inode_ref(root, path, &found_key, 0, cb, sctx);
|
ret = iterate_inode_ref(root, path, &found_key, false, cb, sctx);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
@ -6578,7 +6576,7 @@ static int process_all_extents(struct send_ctx *sctx)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int process_recorded_refs_if_needed(struct send_ctx *sctx, int at_end,
|
static int process_recorded_refs_if_needed(struct send_ctx *sctx, bool at_end,
|
||||||
int *pending_move,
|
int *pending_move,
|
||||||
int *refs_processed)
|
int *refs_processed)
|
||||||
{
|
{
|
||||||
|
|
@ -6601,7 +6599,7 @@ out:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int finish_inode_if_needed(struct send_ctx *sctx, int at_end)
|
static int finish_inode_if_needed(struct send_ctx *sctx, bool at_end)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
struct btrfs_inode_info info;
|
struct btrfs_inode_info info;
|
||||||
|
|
|
||||||
|
|
@ -404,7 +404,7 @@ loop:
|
||||||
*/
|
*/
|
||||||
static int record_root_in_trans(struct btrfs_trans_handle *trans,
|
static int record_root_in_trans(struct btrfs_trans_handle *trans,
|
||||||
struct btrfs_root *root,
|
struct btrfs_root *root,
|
||||||
int force)
|
bool force)
|
||||||
{
|
{
|
||||||
struct btrfs_fs_info *fs_info = root->fs_info;
|
struct btrfs_fs_info *fs_info = root->fs_info;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
@ -2657,9 +2657,9 @@ int btrfs_clean_one_deleted_snapshot(struct btrfs_fs_info *fs_info)
|
||||||
|
|
||||||
if (btrfs_header_backref_rev(root->node) <
|
if (btrfs_header_backref_rev(root->node) <
|
||||||
BTRFS_MIXED_BACKREF_REV)
|
BTRFS_MIXED_BACKREF_REV)
|
||||||
ret = btrfs_drop_snapshot(root, 0, 0);
|
ret = btrfs_drop_snapshot(root, false, false);
|
||||||
else
|
else
|
||||||
ret = btrfs_drop_snapshot(root, 1, 0);
|
ret = btrfs_drop_snapshot(root, true, false);
|
||||||
|
|
||||||
btrfs_put_root(root);
|
btrfs_put_root(root);
|
||||||
return (ret < 0) ? 0 : 1;
|
return (ret < 0) ? 0 : 1;
|
||||||
|
|
|
||||||
|
|
@ -379,7 +379,7 @@ static int process_one_buffer(struct btrfs_root *log,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (btrfs_buffer_uptodate(eb, gen, 0) &&
|
if (btrfs_buffer_uptodate(eb, gen, false) &&
|
||||||
btrfs_header_level(eb) == 0) {
|
btrfs_header_level(eb) == 0) {
|
||||||
ret = btrfs_exclude_logged_extents(eb);
|
ret = btrfs_exclude_logged_extents(eb);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
@ -4398,7 +4398,7 @@ static int truncate_inode_items(struct btrfs_trans_handle *trans,
|
||||||
static void fill_inode_item(struct btrfs_trans_handle *trans,
|
static void fill_inode_item(struct btrfs_trans_handle *trans,
|
||||||
struct extent_buffer *leaf,
|
struct extent_buffer *leaf,
|
||||||
struct btrfs_inode_item *item,
|
struct btrfs_inode_item *item,
|
||||||
struct inode *inode, int log_inode_only,
|
struct inode *inode, bool log_inode_only,
|
||||||
u64 logged_isize)
|
u64 logged_isize)
|
||||||
{
|
{
|
||||||
u64 flags;
|
u64 flags;
|
||||||
|
|
@ -4494,7 +4494,7 @@ static int log_inode_item(struct btrfs_trans_handle *trans,
|
||||||
inode_item = btrfs_item_ptr(path->nodes[0], path->slots[0],
|
inode_item = btrfs_item_ptr(path->nodes[0], path->slots[0],
|
||||||
struct btrfs_inode_item);
|
struct btrfs_inode_item);
|
||||||
fill_inode_item(trans, path->nodes[0], inode_item, &inode->vfs_inode,
|
fill_inode_item(trans, path->nodes[0], inode_item, &inode->vfs_inode,
|
||||||
0, 0);
|
false, 0);
|
||||||
btrfs_release_path(path);
|
btrfs_release_path(path);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4269,7 +4269,7 @@ error:
|
||||||
* @flags: profile to validate
|
* @flags: profile to validate
|
||||||
* @extended: if true @flags is treated as an extended profile
|
* @extended: if true @flags is treated as an extended profile
|
||||||
*/
|
*/
|
||||||
static int alloc_profile_is_valid(u64 flags, int extended)
|
static int alloc_profile_is_valid(u64 flags, bool extended)
|
||||||
{
|
{
|
||||||
u64 mask = (extended ? BTRFS_EXTENDED_PROFILE_MASK :
|
u64 mask = (extended ? BTRFS_EXTENDED_PROFILE_MASK :
|
||||||
BTRFS_BLOCK_GROUP_PROFILE_MASK);
|
BTRFS_BLOCK_GROUP_PROFILE_MASK);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user