From: Omar Sandoval <osandov@osandov.com>
To: David Sterba <dsterba@suse.com>
Cc: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 03/11] btrfs: open code btrfs_dev_replace_stats_inc
Date: Fri, 7 Sep 2018 14:02:20 -0700 [thread overview]
Message-ID: <20180907210220.GF29245@vader> (raw)
In-Reply-To: <111cb329e58b7b24af11c248e861859997cbfc89.1536331604.git.dsterba@suse.com>
On Fri, Sep 07, 2018 at 04:55:06PM +0200, David Sterba wrote:
> The wrapper is too trivial, open coding does not make it less readable.
Reviewed-by: Omar Sandoval <osandov@fb.com>
> Signed-off-by: David Sterba <dsterba@suse.com>
> ---
> fs/btrfs/dev-replace.h | 5 -----
> fs/btrfs/scrub.c | 11 ++++-------
> 2 files changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/fs/btrfs/dev-replace.h b/fs/btrfs/dev-replace.h
> index 39f022c457ff..1c91bf9ef39a 100644
> --- a/fs/btrfs/dev-replace.h
> +++ b/fs/btrfs/dev-replace.h
> @@ -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
> diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
> index 4bcc275f7612..902819d3cf41 100644
> --- a/fs/btrfs/scrub.c
> +++ b/fs/btrfs/scrub.c
> @@ -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;
> }
> @@ -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;
> }
> @@ -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);
> }
> }
>
> @@ -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);
> }
> }
>
> --
> 2.18.0
>
next prev parent reply other threads:[~2018-09-08 1:45 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-07 14:54 [PATCH 00/11] Cleanup dev-replace locking David Sterba
2018-09-07 14:55 ` [PATCH 01/11] btrfs: remove btrfs_dev_replace::read_locks David Sterba
2018-09-07 14:55 ` [PATCH 02/11] btrfs: open code btrfs_dev_replace_clear_lock_blocking David Sterba
2018-09-07 14:55 ` [PATCH 03/11] btrfs: open code btrfs_dev_replace_stats_inc David Sterba
2018-09-07 21:02 ` Omar Sandoval [this message]
2018-09-07 14:55 ` [PATCH 04/11] btrfs: open code btrfs_after_dev_replace_commit David Sterba
2018-09-07 21:03 ` Omar Sandoval
2018-09-07 14:55 ` [PATCH 05/11] btrfs: dev-replace: avoid useless lock on error handling path David Sterba
2018-09-07 21:06 ` Omar Sandoval
2018-09-14 16:53 ` David Sterba
2018-09-07 14:55 ` [PATCH 06/11] btrfs: dev-replace: move replace members out of fs_info David Sterba
2018-09-07 21:09 ` Omar Sandoval
2018-09-07 14:55 ` [PATCH 07/11] btrfs: dev-replace: remove pointless assert in write unlock David Sterba
2018-09-07 14:55 ` [PATCH 08/11] btrfs: reada: reorder dev-replace locks before radix tree preload David Sterba
2018-09-07 14:55 ` [PATCH 09/11] btrfs: dev-replace: swich locking to rw semaphore David Sterba
2018-09-07 14:55 ` [PATCH 10/11] btrfs: dev-replace: remove custom read/write blocking scheme David Sterba
2018-09-07 14:55 ` [PATCH 11/11] btrfs: dev-replace: open code trivial locking helpers David Sterba
2018-09-27 11:06 ` [PATCH 00/11] Cleanup dev-replace locking David Sterba
2018-10-04 1:06 ` Anand Jain
2018-10-04 10:13 ` David Sterba
2018-10-05 8:58 ` Anand Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180907210220.GF29245@vader \
--to=osandov@osandov.com \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.