Commit b82582d6 authored Feb 04, 2020 by Anand Jain Committed by David Sterba Mar 23, 2020

btrfs: slightly simplify global block reserve calculations



In btrfs_update_global_block_rsv the lines:

  num_bytes = block_rsv->size - block_rsv->reserved;
  block_rsv->reserved += num_bytes;

imply:

  block_rsv->reserved = block_rsv->size;

Assign block_rsv->size to block_rsv->reserved directly and reorder lines
so they match the other branch.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 56e9f6ea

fs/btrfs/block-rsv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -389,9 +389,9 @@ void btrfs_update_global_block_rsv(struct btrfs_fs_info *fs_info)

		if (block_rsv->reserved < block_rsv->size) {
		num_bytes = block_rsv->size - block_rsv->reserved;
		block_rsv->reserved += num_bytes;
		btrfs_space_info_update_bytes_may_use(fs_info, sinfo,
		num_bytes);
		block_rsv->reserved = block_rsv->size;
		} else if (block_rsv->reserved > block_rsv->size) {
		num_bytes = block_rsv->reserved - block_rsv->size;
		btrfs_space_info_update_bytes_may_use(fs_info, sinfo,

Admin message