提交 3752d22f 编写于 作者: A Anand Jain 提交者: David Sterba

btrfs: cow_file_range() num_bytes and disk_num_bytes are same

This patch deletes local variable disk_num_bytes as its value
is same as num_bytes in the function cow_file_range().
Signed-off-by: NAnand Jain <anand.jain@oracle.com>
Reviewed-by: NNikolay Borisov <nborisov@suse.com>
Reviewed-by: NDavid Sterba <dsterba@suse.com>
Signed-off-by: NDavid Sterba <dsterba@suse.com>
上级 2afb9653
...@@ -961,7 +961,6 @@ static noinline int cow_file_range(struct inode *inode, ...@@ -961,7 +961,6 @@ static noinline int cow_file_range(struct inode *inode,
u64 alloc_hint = 0; u64 alloc_hint = 0;
u64 num_bytes; u64 num_bytes;
unsigned long ram_size; unsigned long ram_size;
u64 disk_num_bytes;
u64 cur_alloc_size = 0; u64 cur_alloc_size = 0;
u64 blocksize = fs_info->sectorsize; u64 blocksize = fs_info->sectorsize;
struct btrfs_key ins; struct btrfs_key ins;
...@@ -979,7 +978,6 @@ static noinline int cow_file_range(struct inode *inode, ...@@ -979,7 +978,6 @@ static noinline int cow_file_range(struct inode *inode,
num_bytes = ALIGN(end - start + 1, blocksize); num_bytes = ALIGN(end - start + 1, blocksize);
num_bytes = max(blocksize, num_bytes); num_bytes = max(blocksize, num_bytes);
disk_num_bytes = num_bytes;
inode_should_defrag(BTRFS_I(inode), start, end, num_bytes, SZ_64K); inode_should_defrag(BTRFS_I(inode), start, end, num_bytes, SZ_64K);
...@@ -1010,15 +1008,14 @@ static noinline int cow_file_range(struct inode *inode, ...@@ -1010,15 +1008,14 @@ static noinline int cow_file_range(struct inode *inode,
} }
} }
BUG_ON(disk_num_bytes > BUG_ON(num_bytes > btrfs_super_total_bytes(fs_info->super_copy));
btrfs_super_total_bytes(fs_info->super_copy));
alloc_hint = get_extent_allocation_hint(inode, start, num_bytes); alloc_hint = get_extent_allocation_hint(inode, start, num_bytes);
btrfs_drop_extent_cache(BTRFS_I(inode), start, btrfs_drop_extent_cache(BTRFS_I(inode), start,
start + num_bytes - 1, 0); start + num_bytes - 1, 0);
while (disk_num_bytes > 0) { while (num_bytes > 0) {
cur_alloc_size = disk_num_bytes; cur_alloc_size = num_bytes;
ret = btrfs_reserve_extent(root, cur_alloc_size, cur_alloc_size, ret = btrfs_reserve_extent(root, cur_alloc_size, cur_alloc_size,
fs_info->sectorsize, 0, alloc_hint, fs_info->sectorsize, 0, alloc_hint,
&ins, 1, 1); &ins, 1, 1);
...@@ -1082,11 +1079,10 @@ static noinline int cow_file_range(struct inode *inode, ...@@ -1082,11 +1079,10 @@ static noinline int cow_file_range(struct inode *inode,
delalloc_end, locked_page, delalloc_end, locked_page,
EXTENT_LOCKED | EXTENT_DELALLOC, EXTENT_LOCKED | EXTENT_DELALLOC,
page_ops); page_ops);
if (disk_num_bytes < cur_alloc_size) if (num_bytes < cur_alloc_size)
disk_num_bytes = 0; num_bytes = 0;
else else
disk_num_bytes -= cur_alloc_size; num_bytes -= cur_alloc_size;
num_bytes -= cur_alloc_size;
alloc_hint = ins.objectid + ins.offset; alloc_hint = ins.objectid + ins.offset;
start += cur_alloc_size; start += cur_alloc_size;
extent_reserved = false; extent_reserved = false;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册