]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
btrfs: remove check for NULL block reserve at btrfs_block_rsv_check()
authorFilipe Manana <fdmanana@suse.com>
Tue, 21 Mar 2023 11:13:39 +0000 (11:13 +0000)
committerDavid Sterba <dsterba@suse.com>
Mon, 17 Apr 2023 16:01:18 +0000 (18:01 +0200)
The block reserve passed to btrfs_block_rsv_check() is never NULL, so
remove the check. In case it can ever become NULL in the future, then
we'll get a pretty obvious and clear NULL pointer dereference crash and
stack trace.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/block-rsv.c

index 5367a14d44d2ad2b45e89d2352eb3a3d0faeb265..364a3d11bf888970668233f58e9b71c4f4850d77 100644 (file)
@@ -232,9 +232,6 @@ int btrfs_block_rsv_check(struct btrfs_block_rsv *block_rsv, int min_percent)
        u64 num_bytes = 0;
        int ret = -ENOSPC;
 
-       if (!block_rsv)
-               return 0;
-
        spin_lock(&block_rsv->lock);
        num_bytes = mult_perc(block_rsv->size, min_percent);
        if (block_rsv->reserved >= num_bytes)