Skip to content

Commit

Permalink
Btrfs: compress_file_range remove dead variable num_bytes
Browse files Browse the repository at this point in the history
Remove dead assigment of num_bytes.

Also as num_bytes only used in the will_compress block as copy of
total_in just replace that with total_in and drop num_bytes entirely.

Signed-off-by: Timofey Titovets <nefelim4ag@gmail.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
Timofey Titovets authored and David Sterba committed Oct 30, 2017
1 parent a7e3c5f commit 1170862
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions fs/btrfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,6 @@ static noinline void compress_file_range(struct inode *inode,
{
struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
struct btrfs_root *root = BTRFS_I(inode)->root;
u64 num_bytes;
u64 blocksize = fs_info->sectorsize;
u64 actual_end;
u64 isize = i_size_read(inode);
Expand Down Expand Up @@ -508,8 +507,6 @@ static noinline void compress_file_range(struct inode *inode,

total_compressed = min_t(unsigned long, total_compressed,
BTRFS_MAX_UNCOMPRESSED);
num_bytes = ALIGN(end - start + 1, blocksize);
num_bytes = max(blocksize, num_bytes);
total_in = 0;
ret = 0;

Expand Down Expand Up @@ -625,20 +622,19 @@ static noinline void compress_file_range(struct inode *inode,
*/
total_in = ALIGN(total_in, PAGE_SIZE);
if (total_compressed + blocksize <= total_in) {
num_bytes = total_in;
*num_added += 1;

/*
* The async work queues will take care of doing actual
* allocation on disk for these compressed pages, and
* will submit them to the elevator.
*/
add_async_extent(async_cow, start, num_bytes,
add_async_extent(async_cow, start, total_in,
total_compressed, pages, nr_pages,
compress_type);

if (start + num_bytes < end) {
start += num_bytes;
if (start + total_in < end) {
start += total_in;
pages = NULL;
cond_resched();
goto again;
Expand Down

0 comments on commit 1170862

Please sign in to comment.