Skip to content

Commit

Permalink
btrfs: open code btrfs_dev_replace_stats_inc
Browse files Browse the repository at this point in the history
The wrapper is too trivial, open coding does not make it less readable.

Reviewed-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
David Sterba committed Oct 15, 2018
1 parent 7fb2ece commit e37abe9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
5 changes: 0 additions & 5 deletions fs/btrfs/dev-replace.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,4 @@ void btrfs_dev_replace_write_lock(struct btrfs_dev_replace *dev_replace);
void btrfs_dev_replace_write_unlock(struct btrfs_dev_replace *dev_replace);
void btrfs_dev_replace_set_lock_blocking(struct btrfs_dev_replace *dev_replace);

static inline void btrfs_dev_replace_stats_inc(atomic64_t *stat_value)
{
atomic64_inc(stat_value);
}

#endif
11 changes: 4 additions & 7 deletions fs/btrfs/scrub.c
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,7 @@ static int scrub_handle_errored_block(struct scrub_block *sblock_to_check)

if (scrub_write_page_to_dev_replace(sblock_other,
page_num) != 0) {
btrfs_dev_replace_stats_inc(
atomic64_inc(
&fs_info->dev_replace.num_write_errors);
success = 0;
}
Expand Down Expand Up @@ -1564,8 +1564,7 @@ static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad,
if (btrfsic_submit_bio_wait(bio)) {
btrfs_dev_stat_inc_and_print(page_bad->dev,
BTRFS_DEV_STAT_WRITE_ERRS);
btrfs_dev_replace_stats_inc(
&fs_info->dev_replace.num_write_errors);
atomic64_inc(&fs_info->dev_replace.num_write_errors);
bio_put(bio);
return -EIO;
}
Expand All @@ -1592,8 +1591,7 @@ static void scrub_write_block_to_dev_replace(struct scrub_block *sblock)

ret = scrub_write_page_to_dev_replace(sblock, page_num);
if (ret)
btrfs_dev_replace_stats_inc(
&fs_info->dev_replace.num_write_errors);
atomic64_inc(&fs_info->dev_replace.num_write_errors);
}
}

Expand Down Expand Up @@ -1726,8 +1724,7 @@ static void scrub_wr_bio_end_io_worker(struct btrfs_work *work)
struct scrub_page *spage = sbio->pagev[i];

spage->io_error = 1;
btrfs_dev_replace_stats_inc(&dev_replace->
num_write_errors);
atomic64_inc(&dev_replace->num_write_errors);
}
}

Expand Down

0 comments on commit e37abe9

Please sign in to comment.