Skip to content

Commit 9f6fa5b

Browse files
fdmananakdave
authored andcommitted
btrfs: use boolean for delalloc argument to btrfs_free_reserved_extent()
We are using an integer for the 'delalloc' argument but all we need is a boolean, so switch the type to 'bool' and rename the parameter to 'is_delalloc' to better match the fact that it's a boolean. Reviewed-by: Boris Burkov <[email protected]> Signed-off-by: Filipe Manana <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent ba4ec9a commit 9f6fa5b

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

fs/btrfs/direct-io.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,7 @@ static struct extent_map *btrfs_new_extent_direct(struct btrfs_inode *inode,
204204
BTRFS_ORDERED_REGULAR);
205205
btrfs_dec_block_group_reservations(fs_info, ins.objectid);
206206
if (IS_ERR(em))
207-
btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset,
208-
1);
207+
btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, true);
209208

210209
return em;
211210
}

fs/btrfs/extent-tree.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4733,8 +4733,8 @@ int btrfs_reserve_extent(struct btrfs_root *root, u64 ram_bytes,
47334733
return ret;
47344734
}
47354735

4736-
int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,
4737-
u64 start, u64 len, int delalloc)
4736+
int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, u64 start, u64 len,
4737+
bool is_delalloc)
47384738
{
47394739
struct btrfs_block_group *cache;
47404740

@@ -4746,7 +4746,7 @@ int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,
47464746
}
47474747

47484748
btrfs_add_free_space(cache, start, len);
4749-
btrfs_free_reserved_bytes(cache, len, delalloc);
4749+
btrfs_free_reserved_bytes(cache, len, is_delalloc);
47504750
trace_btrfs_reserved_extent_free(fs_info, start, len);
47514751

47524752
btrfs_put_block_group(cache);
@@ -5220,7 +5220,7 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,
52205220
btrfs_tree_unlock(buf);
52215221
free_extent_buffer(buf);
52225222
out_free_reserved:
5223-
btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 0);
5223+
btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, false);
52245224
out_unuse:
52255225
btrfs_unuse_block_rsv(fs_info, block_rsv, blocksize);
52265226
return ERR_PTR(ret);

fs/btrfs/extent-tree.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref);
149149

150150
u64 btrfs_get_extent_owner_root(struct btrfs_fs_info *fs_info,
151151
struct extent_buffer *leaf, int slot);
152-
int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,
153-
u64 start, u64 len, int delalloc);
152+
int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, u64 start, u64 len,
153+
bool is_delalloc);
154154
int btrfs_pin_reserved_extent(struct btrfs_trans_handle *trans,
155155
const struct extent_buffer *eb);
156156
int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans);

fs/btrfs/inode.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1181,7 +1181,7 @@ static void submit_one_async_extent(struct async_chunk *async_chunk,
11811181

11821182
out_free_reserve:
11831183
btrfs_dec_block_group_reservations(fs_info, ins.objectid);
1184-
btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 1);
1184+
btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, true);
11851185
mapping_set_error(inode->vfs_inode.i_mapping, -EIO);
11861186
extent_clear_unlock_delalloc(inode, start, end,
11871187
NULL, &cached,
@@ -1459,7 +1459,7 @@ static noinline int cow_file_range(struct btrfs_inode *inode,
14591459
btrfs_drop_extent_map_range(inode, start, start + cur_alloc_size - 1, false);
14601460
out_reserve:
14611461
btrfs_dec_block_group_reservations(fs_info, ins.objectid);
1462-
btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 1);
1462+
btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, true);
14631463
out_unlock:
14641464
/*
14651465
* Now, we have three regions to clean up:
@@ -3289,7 +3289,7 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)
32893289
NULL);
32903290
btrfs_free_reserved_extent(fs_info,
32913291
ordered_extent->disk_bytenr,
3292-
ordered_extent->disk_num_bytes, 1);
3292+
ordered_extent->disk_num_bytes, true);
32933293
/*
32943294
* Actually free the qgroup rsv which was released when
32953295
* the ordered extent was created.
@@ -8999,7 +8999,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
89998999
if (IS_ERR(trans)) {
90009000
ret = PTR_ERR(trans);
90019001
btrfs_free_reserved_extent(fs_info, ins.objectid,
9002-
ins.offset, 0);
9002+
ins.offset, false);
90039003
break;
90049004
}
90059005

@@ -9827,7 +9827,7 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from,
98279827

98289828
out_free_reserved:
98299829
btrfs_dec_block_group_reservations(fs_info, ins.objectid);
9830-
btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 1);
9830+
btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, true);
98319831
out_delalloc_release:
98329832
btrfs_delalloc_release_extents(inode, num_bytes);
98339833
btrfs_delalloc_release_metadata(inode, disk_num_bytes, ret < 0);

0 commit comments

Comments
 (0)