btrfs: use booleans for delalloc arguments and struct find_free_extent_ctl

The struct find_free_extent_ctl uses an int for the 'delalloc' field but
it's always used as a boolean, and its value is used to be passed to
several functions to signal if we are dealing with delalloc. The same goes
for the 'is_data' argument from btrfs_reserve_extent(). So change the type
from int to bool and move the field definition in the find_free_extent_ctl
structure so that it's close to other bool fields and reduces the size of
the structure from 144 down to 136 bytes (at the moment it's only declared
in the stack of btrfs_reserve_extent(), never allocated otherwise).

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
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/block-group.c b/fs/btrfs/block-group.c
index ebbf0450178244035b9f95f3576cd4c31a925fb2..8ae73123b610c55cfec1e7cb269e82c13eda387d 100644 (file)
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -3802,7 +3802,7 @@ int btrfs_update_block_group(struct btrfs_trans_handle *trans,
  * reservation and return -EAGAIN, otherwise this function always succeeds.
  */
 int btrfs_add_reserved_bytes(struct btrfs_block_group *cache,
-                            u64 ram_bytes, u64 num_bytes, int delalloc,
+                            u64 ram_bytes, u64 num_bytes, bool delalloc,
                             bool force_wrong_size_class)
 {
        struct btrfs_space_info *space_info = cache->space_info;

diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h
index 9172104a5889ece6ff839158c22714186ae730a9..5f933455118c79f6d3173f8a1959af3ef15ad9db 100644 (file)
--- a/fs/btrfs/block-group.h
+++ b/fs/btrfs/block-group.h
@@ -345,7 +345,7 @@ int btrfs_setup_space_cache(struct btrfs_trans_handle *trans);
 int btrfs_update_block_group(struct btrfs_trans_handle *trans,
                             u64 bytenr, u64 num_bytes, bool alloc);
 int btrfs_add_reserved_bytes(struct btrfs_block_group *cache,
-                            u64 ram_bytes, u64 num_bytes, int delalloc,
+                            u64 ram_bytes, u64 num_bytes, bool delalloc,
                             bool force_wrong_size_class);
 void btrfs_free_reserved_bytes(struct btrfs_block_group *cache, u64 num_bytes,
                               bool is_delalloc);

diff --git a/fs/btrfs/direct-io.c b/fs/btrfs/direct-io.c
index 962fccceffd637e424dc959213603ba64d8b9414..07e19e88ba4b3f83d6d36dcc02115b6727982140 100644 (file)
--- a/fs/btrfs/direct-io.c
+++ b/fs/btrfs/direct-io.c
@@ -186,7 +186,7 @@ static struct extent_map *btrfs_new_extent_direct(struct btrfs_inode *inode,
        alloc_hint = btrfs_get_extent_allocation_hint(inode, start, len);
 again:
        ret = btrfs_reserve_extent(root, len, len, fs_info->sectorsize,
-                                  0, alloc_hint, &ins, 1, 1);
+                                  0, alloc_hint, &ins, true, true);
        if (ret == -EAGAIN) {
                ASSERT(btrfs_is_zoned(fs_info));
                wait_on_bit_io(&inode->root->fs_info->flags, BTRFS_FS_NEED_ZONE_FINISH,

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 819e0a15e8e7da227ea49e18f9736e35a9710de5..a3646440c4fe128d7f942335b23bc9f5ca7e677a 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3587,15 +3587,14 @@ enum btrfs_loop_type {
 };
 
 static inline void
-btrfs_lock_block_group(struct btrfs_block_group *cache,
-                      int delalloc)
+btrfs_lock_block_group(struct btrfs_block_group *cache, bool delalloc)
 {
        if (delalloc)
                down_read(&cache->data_rwsem);
 }
 
 static inline void btrfs_grab_block_group(struct btrfs_block_group *cache,
-                      int delalloc)
+                                         bool delalloc)
 {
        btrfs_get_block_group(cache);
        if (delalloc)
@@ -3605,7 +3604,7 @@ static inline void btrfs_grab_block_group(struct btrfs_block_group *cache,
 static struct btrfs_block_group *btrfs_lock_cluster(
                   struct btrfs_block_group *block_group,
                   struct btrfs_free_cluster *cluster,
-                  int delalloc)
+                  bool delalloc)
        __acquires(&cluster->refill_lock)
 {
        struct btrfs_block_group *used_bg = NULL;
@@ -3642,8 +3641,7 @@ static struct btrfs_block_group *btrfs_lock_cluster(
 }
 
 static inline void
-btrfs_release_block_group(struct btrfs_block_group *cache,
-                        int delalloc)
+btrfs_release_block_group(struct btrfs_block_group *cache, bool delalloc)
 {
        if (delalloc)
                up_read(&cache->data_rwsem);
@@ -4033,7 +4031,7 @@ static int do_allocation(struct btrfs_block_group *block_group,
 
 static void release_block_group(struct btrfs_block_group *block_group,
                                struct find_free_extent_ctl *ffe_ctl,
-                               int delalloc)
+                               bool delalloc)
 {
        switch (ffe_ctl->policy) {
        case BTRFS_EXTENT_ALLOC_CLUSTERED:
@@ -4689,7 +4687,7 @@ loop:
 int btrfs_reserve_extent(struct btrfs_root *root, u64 ram_bytes,
                         u64 num_bytes, u64 min_alloc_size,
                         u64 empty_size, u64 hint_byte,
-                        struct btrfs_key *ins, int is_data, int delalloc)
+                        struct btrfs_key *ins, bool is_data, bool delalloc)
 {
        struct btrfs_fs_info *fs_info = root->fs_info;
        struct find_free_extent_ctl ffe_ctl = {};
@@ -5166,7 +5164,7 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,
                return ERR_CAST(block_rsv);
 
        ret = btrfs_reserve_extent(root, blocksize, blocksize, blocksize,
-                                  empty_size, hint, &ins, 0, 0);
+                                  empty_size, hint, &ins, false, false);
        if (ret)
                goto out_unuse;
 

diff --git a/fs/btrfs/extent-tree.h b/fs/btrfs/extent-tree.h
index e573509c5a71d82ad7b79b05ca556d58e763705e..f96a300a2db4a84a940e5c28c81f3564e8dea929 100644 (file)
--- a/fs/btrfs/extent-tree.h
+++ b/fs/btrfs/extent-tree.h
@@ -30,7 +30,6 @@ struct find_free_extent_ctl {
        u64 min_alloc_size;
        u64 empty_size;
        u64 flags;
-       int delalloc;
 
        /* Where to start the search inside the bg */
        u64 search_start;
@@ -40,6 +39,7 @@ struct find_free_extent_ctl {
        struct btrfs_free_cluster *last_ptr;
        bool use_cluster;
 
+       bool delalloc;
        bool have_caching_bg;
        bool orig_have_caching_bg;
 
@@ -137,7 +137,7 @@ int btrfs_alloc_logged_file_extent(struct btrfs_trans_handle *trans,
                                   struct btrfs_key *ins);
 int btrfs_reserve_extent(struct btrfs_root *root, u64 ram_bytes, u64 num_bytes,
                         u64 min_alloc_size, u64 empty_size, u64 hint_byte,
-                        struct btrfs_key *ins, int is_data, int delalloc);
+                        struct btrfs_key *ins, bool is_data, bool delalloc);
 int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                  struct extent_buffer *buf, bool full_backref);
 int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index fc0f0c46ab22fcab7bfa2696fa627b5f94ea17f4..f71a5f7f55b9fa57454e7b4835aad9ce44832d8d 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1136,7 +1136,7 @@ static void submit_one_async_extent(struct async_chunk *async_chunk,
        ret = btrfs_reserve_extent(root, async_extent->ram_size,
                                   async_extent->compressed_size,
                                   async_extent->compressed_size,
-                                  0, *alloc_hint, &ins, 1, 1);
+                                  0, *alloc_hint, &ins, true, true);
        if (ret) {
                /*
                 * We can't reserve contiguous space for the compressed size.
@@ -1359,7 +1359,7 @@ static noinline int cow_file_range(struct btrfs_inode *inode,
 
                ret = btrfs_reserve_extent(root, num_bytes, num_bytes,
                                           min_alloc_size, 0, alloc_hint,
-                                          &ins, 1, 1);
+                                          &ins, true, true);
                if (ret == -EAGAIN) {
                        /*
                         * btrfs_reserve_extent only returns -EAGAIN for zoned
@@ -9106,7 +9106,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
                 */
                cur_bytes = min(cur_bytes, last_alloc);
                ret = btrfs_reserve_extent(root, cur_bytes, cur_bytes,
-                               min_size, 0, *alloc_hint, &ins, 1, 0);
+                               min_size, 0, *alloc_hint, &ins, true, false);
                if (ret)
                        break;
 
@@ -9914,7 +9914,7 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from,
        }
 
        ret = btrfs_reserve_extent(root, disk_num_bytes, disk_num_bytes,
-                                  disk_num_bytes, 0, 0, &ins, 1, 1);
+                                  disk_num_bytes, 0, 0, &ins, true, true);
        if (ret)
                goto out_delalloc_release;
        extent_reserved = true;