OSDN Git Service

btrfs: Fix bool initialization/comparison
authorThomas Meyer <thomas@m3y3r.de>
Sat, 7 Oct 2017 14:02:21 +0000 (16:02 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 30 Oct 2017 11:27:58 +0000 (12:27 +0100)
Bool initializations should use true and false. Bool tests don't need
comparisons.

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/extent-tree.c
fs/btrfs/file.c
fs/btrfs/inode.c

index 1a6aced..624aa68 100644 (file)
@@ -6960,7 +6960,7 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans,
        BUG_ON(!is_data && refs_to_drop != 1);
 
        if (is_data)
-               skinny_metadata = 0;
+               skinny_metadata = false;
 
        ret = lookup_extent_backref(trans, info, path, &iref,
                                    bytenr, num_bytes, parent,
@@ -9313,7 +9313,7 @@ out:
         * don't have it in the radix (like when we recover after a power fail
         * or unmount) so we don't leak memory.
         */
-       if (!for_reloc && root_dropped == false)
+       if (!for_reloc && !root_dropped)
                btrfs_add_dead_root(root);
        if (err && err != -EAGAIN)
                btrfs_handle_fs_error(fs_info, err, NULL);
index aafcc78..7994505 100644 (file)
@@ -2046,7 +2046,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
        struct btrfs_trans_handle *trans;
        struct btrfs_log_ctx ctx;
        int ret = 0, err;
-       bool full_sync = 0;
+       bool full_sync = false;
        u64 len;
 
        /*
index 6274be6..2c08e09 100644 (file)
@@ -4451,9 +4451,9 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
        int err = 0;
        u64 ino = btrfs_ino(BTRFS_I(inode));
        u64 bytes_deleted = 0;
-       bool be_nice = 0;
-       bool should_throttle = 0;
-       bool should_end = 0;
+       bool be_nice = false;
+       bool should_throttle = false;
+       bool should_end = false;
 
        BUG_ON(new_size > 0 && min_type != BTRFS_EXTENT_DATA_KEY);
 
@@ -4463,7 +4463,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,
         */
        if (!btrfs_is_free_space_inode(BTRFS_I(inode)) &&
            test_bit(BTRFS_ROOT_REF_COWS, &root->state))
-               be_nice = 1;
+               be_nice = true;
 
        path = btrfs_alloc_path();
        if (!path)
@@ -4669,7 +4669,7 @@ delete:
                } else {
                        break;
                }
-               should_throttle = 0;
+               should_throttle = false;
 
                if (found_extent &&
                    (test_bit(BTRFS_ROOT_REF_COWS, &root->state) ||
@@ -4688,11 +4688,11 @@ delete:
                        if (be_nice) {
                                if (truncate_space_check(trans, root,
                                                         extent_num_bytes)) {
-                                       should_end = 1;
+                                       should_end = true;
                                }
                                if (btrfs_should_throttle_delayed_refs(trans,
                                                                       fs_info))
-                                       should_throttle = 1;
+                                       should_throttle = true;
                        }
                }