diff options
Diffstat (limited to 'fs/btrfs/scrub.c')
-rw-r--r-- | fs/btrfs/scrub.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 266f24febce3..fcdf67ffacb0 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c | |||
@@ -754,8 +754,7 @@ out: | |||
754 | num_uncorrectable_read_errors); | 754 | num_uncorrectable_read_errors); |
755 | printk_ratelimited_in_rcu(KERN_ERR | 755 | printk_ratelimited_in_rcu(KERN_ERR |
756 | "btrfs: unable to fixup (nodatasum) error at logical %llu on dev %s\n", | 756 | "btrfs: unable to fixup (nodatasum) error at logical %llu on dev %s\n", |
757 | (unsigned long long)fixup->logical, | 757 | fixup->logical, rcu_str_deref(fixup->dev->name)); |
758 | rcu_str_deref(fixup->dev->name)); | ||
759 | } | 758 | } |
760 | 759 | ||
761 | btrfs_free_path(path); | 760 | btrfs_free_path(path); |
@@ -1154,8 +1153,7 @@ corrected_error: | |||
1154 | spin_unlock(&sctx->stat_lock); | 1153 | spin_unlock(&sctx->stat_lock); |
1155 | printk_ratelimited_in_rcu(KERN_ERR | 1154 | printk_ratelimited_in_rcu(KERN_ERR |
1156 | "btrfs: fixed up error at logical %llu on dev %s\n", | 1155 | "btrfs: fixed up error at logical %llu on dev %s\n", |
1157 | (unsigned long long)logical, | 1156 | logical, rcu_str_deref(dev->name)); |
1158 | rcu_str_deref(dev->name)); | ||
1159 | } | 1157 | } |
1160 | } else { | 1158 | } else { |
1161 | did_not_correct_error: | 1159 | did_not_correct_error: |
@@ -1164,8 +1162,7 @@ did_not_correct_error: | |||
1164 | spin_unlock(&sctx->stat_lock); | 1162 | spin_unlock(&sctx->stat_lock); |
1165 | printk_ratelimited_in_rcu(KERN_ERR | 1163 | printk_ratelimited_in_rcu(KERN_ERR |
1166 | "btrfs: unable to fixup (regular) error at logical %llu on dev %s\n", | 1164 | "btrfs: unable to fixup (regular) error at logical %llu on dev %s\n", |
1167 | (unsigned long long)logical, | 1165 | logical, rcu_str_deref(dev->name)); |
1168 | rcu_str_deref(dev->name)); | ||
1169 | } | 1166 | } |
1170 | 1167 | ||
1171 | out: | 1168 | out: |
@@ -2455,8 +2452,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx, | |||
2455 | printk(KERN_ERR | 2452 | printk(KERN_ERR |
2456 | "btrfs scrub: tree block %llu spanning " | 2453 | "btrfs scrub: tree block %llu spanning " |
2457 | "stripes, ignored. logical=%llu\n", | 2454 | "stripes, ignored. logical=%llu\n", |
2458 | (unsigned long long)key.objectid, | 2455 | key.objectid, logical); |
2459 | (unsigned long long)logical); | ||
2460 | goto next; | 2456 | goto next; |
2461 | } | 2457 | } |
2462 | 2458 | ||
@@ -3176,9 +3172,7 @@ static void copy_nocow_pages_worker(struct btrfs_work *work) | |||
3176 | nocow_ctx); | 3172 | nocow_ctx); |
3177 | if (ret != 0 && ret != -ENOENT) { | 3173 | if (ret != 0 && ret != -ENOENT) { |
3178 | pr_warn("iterate_inodes_from_logical() failed: log %llu, phys %llu, len %llu, mir %llu, ret %d\n", | 3174 | pr_warn("iterate_inodes_from_logical() failed: log %llu, phys %llu, len %llu, mir %llu, ret %d\n", |
3179 | (unsigned long long)logical, | 3175 | logical, physical_for_dev_replace, len, |
3180 | (unsigned long long)physical_for_dev_replace, | ||
3181 | (unsigned long long)len, | ||
3182 | (unsigned long long)mirror_num, ret); | 3176 | (unsigned long long)mirror_num, ret); |
3183 | not_written = 1; | 3177 | not_written = 1; |
3184 | goto out; | 3178 | goto out; |