btrfs: switch btrfs_block_rsv::full to bool
authorDavid Sterba <dsterba@suse.com>
Thu, 23 Jun 2022 15:08:14 +0000 (17:08 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 25 Jul 2022 15:45:40 +0000 (17:45 +0200)
Use simple bool type for the block reserve full status, there's short to
save space as there used to be int but there's no reason for that.

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/block-rsv.c
fs/btrfs/block-rsv.h
fs/btrfs/delayed-ref.c

index b3ee49b..26c43a6 100644 (file)
@@ -118,7 +118,7 @@ static u64 block_rsv_release_bytes(struct btrfs_fs_info *fs_info,
        if (block_rsv->reserved >= block_rsv->size) {
                num_bytes = block_rsv->reserved - block_rsv->size;
                block_rsv->reserved = block_rsv->size;
-               block_rsv->full = 1;
+               block_rsv->full = true;
        } else {
                num_bytes = 0;
        }
@@ -142,7 +142,7 @@ static u64 block_rsv_release_bytes(struct btrfs_fs_info *fs_info,
                                bytes_to_add = min(num_bytes, bytes_to_add);
                                dest->reserved += bytes_to_add;
                                if (dest->reserved >= dest->size)
-                                       dest->full = 1;
+                                       dest->full = true;
                                num_bytes -= bytes_to_add;
                        }
                        spin_unlock(&dest->lock);
@@ -304,7 +304,7 @@ int btrfs_block_rsv_use_bytes(struct btrfs_block_rsv *block_rsv, u64 num_bytes)
        if (block_rsv->reserved >= num_bytes) {
                block_rsv->reserved -= num_bytes;
                if (block_rsv->reserved < block_rsv->size)
-                       block_rsv->full = 0;
+                       block_rsv->full = false;
                ret = 0;
        }
        spin_unlock(&block_rsv->lock);
@@ -319,7 +319,7 @@ void btrfs_block_rsv_add_bytes(struct btrfs_block_rsv *block_rsv,
        if (update_size)
                block_rsv->size += num_bytes;
        else if (block_rsv->reserved >= block_rsv->size)
-               block_rsv->full = 1;
+               block_rsv->full = true;
        spin_unlock(&block_rsv->lock);
 }
 
@@ -341,7 +341,7 @@ int btrfs_cond_migrate_bytes(struct btrfs_fs_info *fs_info,
        }
        global_rsv->reserved -= num_bytes;
        if (global_rsv->reserved < global_rsv->size)
-               global_rsv->full = 0;
+               global_rsv->full = false;
        spin_unlock(&global_rsv->lock);
 
        btrfs_block_rsv_add_bytes(dest, num_bytes, true);
@@ -408,10 +408,7 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info)
                btrfs_try_granting_tickets(fs_info, sinfo);
        }
 
-       if (block_rsv->reserved == block_rsv->size)
-               block_rsv->full = 1;
-       else
-               block_rsv->full = 0;
+       block_rsv->full = (block_rsv->reserved == block_rsv->size);
 
        if (block_rsv->size >= sinfo->total_bytes)
                sinfo->force_alloc = CHUNK_ALLOC_FORCE;
index 3b67ff0..99c491e 100644 (file)
@@ -25,7 +25,7 @@ struct btrfs_block_rsv {
        u64 reserved;
        struct btrfs_space_info *space_info;
        spinlock_t lock;
-       unsigned short full;
+       bool full;
        unsigned short type;
        unsigned short failfast;
 
index 99f37fc..36a3deb 100644 (file)
@@ -132,7 +132,7 @@ void btrfs_update_delayed_refs_rsv(struct btrfs_trans_handle *trans)
 
        spin_lock(&delayed_rsv->lock);
        delayed_rsv->size += num_bytes;
-       delayed_rsv->full = 0;
+       delayed_rsv->full = false;
        spin_unlock(&delayed_rsv->lock);
        trans->delayed_ref_updates = 0;
 }
@@ -175,7 +175,7 @@ void btrfs_migrate_to_delayed_refs_rsv(struct btrfs_fs_info *fs_info,
        if (num_bytes)
                delayed_refs_rsv->reserved += num_bytes;
        if (delayed_refs_rsv->reserved >= delayed_refs_rsv->size)
-               delayed_refs_rsv->full = 1;
+               delayed_refs_rsv->full = true;
        spin_unlock(&delayed_refs_rsv->lock);
 
        if (num_bytes)