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 <boris@bur.io>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/direct-io.c b/fs/btrfs/direct-io.c
index fde612d9b077e3be5b1c18d8b17c6fdb5e0ff0b2..546410c8fac0fee1fa136b7d0b604eecfabf8f35 100644 (file)
--- a/fs/btrfs/direct-io.c
+++ b/fs/btrfs/direct-io.c
@@ -204,8 +204,7 @@ again:
                                     BTRFS_ORDERED_REGULAR);
        btrfs_dec_block_group_reservations(fs_info, ins.objectid);
        if (IS_ERR(em))
-               btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset,
-                                          1);
+               btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, true);
 
        return em;
 }

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index ca229381d448b6f327a45ef5dfc7639b8f7c9b60..1aa584a79422aa88ddee19c1f0526862f0e39869 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4733,8 +4733,8 @@ again:
        return ret;
 }
 
-int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,
-                              u64 start, u64 len, int delalloc)
+int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, u64 start, u64 len,
+                              bool is_delalloc)
 {
        struct btrfs_block_group *cache;
 
@@ -4746,7 +4746,7 @@ int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,
        }
 
        btrfs_add_free_space(cache, start, len);
-       btrfs_free_reserved_bytes(cache, len, delalloc);
+       btrfs_free_reserved_bytes(cache, len, is_delalloc);
        trace_btrfs_reserved_extent_free(fs_info, start, len);
 
        btrfs_put_block_group(cache);
@@ -5220,7 +5220,7 @@ out_free_buf:
        btrfs_tree_unlock(buf);
        free_extent_buffer(buf);
 out_free_reserved:
-       btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 0);
+       btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, false);
 out_unuse:
        btrfs_unuse_block_rsv(fs_info, block_rsv, blocksize);
        return ERR_PTR(ret);

diff --git a/fs/btrfs/extent-tree.h b/fs/btrfs/extent-tree.h
index 0ed682d9ed7b48d70abfdc7566e0992fa63be359..72914074c30462037108e0a90077111b6f843ae0 100644 (file)
--- a/fs/btrfs/extent-tree.h
+++ b/fs/btrfs/extent-tree.h
@@ -149,8 +149,8 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref);
 
 u64 btrfs_get_extent_owner_root(struct btrfs_fs_info *fs_info,
                                struct extent_buffer *leaf, int slot);
-int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,
-                              u64 start, u64 len, int delalloc);
+int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, u64 start, u64 len,
+                              bool is_delalloc);
 int btrfs_pin_reserved_extent(struct btrfs_trans_handle *trans,
                              const struct extent_buffer *eb);
 int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 9dfa9f421306136893431fbb3a6a2ea31a8c864e..964088d3f3f785a6b4313999999113a6348770cf 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1181,7 +1181,7 @@ done:
 
 out_free_reserve:
        btrfs_dec_block_group_reservations(fs_info, ins.objectid);
-       btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 1);
+       btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, true);
        mapping_set_error(inode->vfs_inode.i_mapping, -EIO);
        extent_clear_unlock_delalloc(inode, start, end,
                                     NULL, &cached,
@@ -1459,7 +1459,7 @@ out_drop_extent_cache:
        btrfs_drop_extent_map_range(inode, start, start + cur_alloc_size - 1, false);
 out_reserve:
        btrfs_dec_block_group_reservations(fs_info, ins.objectid);
-       btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 1);
+       btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, true);
 out_unlock:
        /*
         * Now, we have three regions to clean up:
@@ -3289,7 +3289,7 @@ out:
                                                NULL);
                        btrfs_free_reserved_extent(fs_info,
                                        ordered_extent->disk_bytenr,
-                                       ordered_extent->disk_num_bytes, 1);
+                                       ordered_extent->disk_num_bytes, true);
                        /*
                         * Actually free the qgroup rsv which was released when
                         * the ordered extent was created.
@@ -8999,7 +8999,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
                if (IS_ERR(trans)) {
                        ret = PTR_ERR(trans);
                        btrfs_free_reserved_extent(fs_info, ins.objectid,
-                                                  ins.offset, 0);
+                                                  ins.offset, false);
                        break;
                }
 
@@ -9827,7 +9827,7 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from,
 
 out_free_reserved:
        btrfs_dec_block_group_reservations(fs_info, ins.objectid);
-       btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, 1);
+       btrfs_free_reserved_extent(fs_info, ins.objectid, ins.offset, true);
 out_delalloc_release:
        btrfs_delalloc_release_extents(inode, num_bytes);
        btrfs_delalloc_release_metadata(inode, disk_num_bytes, ret < 0);