btrfs: scrub: rename ratelimit state varaible to avoid shadowing
authorDavid Sterba <dsterba@suse.com>
Mon, 17 Aug 2020 10:12:38 +0000 (12:12 +0200)
committerDavid Sterba <dsterba@suse.com>
Wed, 7 Oct 2020 10:06:55 +0000 (12:06 +0200)
There's already defined _rs within ctree.h:btrfs_printk_ratelimited,
local variables should not use _ to avoid such name clashes with
macro-local variables.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/scrub.c

index 354ab99..cf63f1e 100644 (file)
@@ -835,7 +835,7 @@ static int scrub_handle_errored_block(struct scrub_block *sblock_to_check)
        int success;
        bool full_stripe_locked;
        unsigned int nofs_flag;
-       static DEFINE_RATELIMIT_STATE(_rs, DEFAULT_RATELIMIT_INTERVAL,
+       static DEFINE_RATELIMIT_STATE(rs, DEFAULT_RATELIMIT_INTERVAL,
                                      DEFAULT_RATELIMIT_BURST);
 
        BUG_ON(sblock_to_check->page_count < 1);
@@ -969,14 +969,14 @@ static int scrub_handle_errored_block(struct scrub_block *sblock_to_check)
                spin_lock(&sctx->stat_lock);
                sctx->stat.read_errors++;
                spin_unlock(&sctx->stat_lock);
-               if (__ratelimit(&_rs))
+               if (__ratelimit(&rs))
                        scrub_print_warning("i/o error", sblock_to_check);
                btrfs_dev_stat_inc_and_print(dev, BTRFS_DEV_STAT_READ_ERRS);
        } else if (sblock_bad->checksum_error) {
                spin_lock(&sctx->stat_lock);
                sctx->stat.csum_errors++;
                spin_unlock(&sctx->stat_lock);
-               if (__ratelimit(&_rs))
+               if (__ratelimit(&rs))
                        scrub_print_warning("checksum error", sblock_to_check);
                btrfs_dev_stat_inc_and_print(dev,
                                             BTRFS_DEV_STAT_CORRUPTION_ERRS);
@@ -984,7 +984,7 @@ static int scrub_handle_errored_block(struct scrub_block *sblock_to_check)
                spin_lock(&sctx->stat_lock);
                sctx->stat.verify_errors++;
                spin_unlock(&sctx->stat_lock);
-               if (__ratelimit(&_rs))
+               if (__ratelimit(&rs))
                        scrub_print_warning("checksum/header error",
                                            sblock_to_check);
                if (sblock_bad->generation_error)