Skip to content

Commit f9eab5f

Browse files
adam900710kdave
authored andcommitted
btrfs: scrub: try to fix super block errors
[BUG] The following script shows that, although scrub can detect super block errors, it never tries to fix it: mkfs.btrfs -f -d raid1 -m raid1 $dev1 $dev2 xfs_io -c "pwrite 67108864 4k" $dev2 mount $dev1 $mnt btrfs scrub start -B $dev2 btrfs scrub start -Br $dev2 umount $mnt The first scrub reports the super error correctly: scrub done for f3289218-abd3-41ac-a630-202f766c0859 Scrub started: Tue Aug 2 14:44:11 2022 Status: finished Duration: 0:00:00 Total to scrub: 1.26GiB Rate: 0.00B/s Error summary: super=1 Corrected: 0 Uncorrectable: 0 Unverified: 0 But the second read-only scrub still reports the same super error: Scrub started: Tue Aug 2 14:44:11 2022 Status: finished Duration: 0:00:00 Total to scrub: 1.26GiB Rate: 0.00B/s Error summary: super=1 Corrected: 0 Uncorrectable: 0 Unverified: 0 [CAUSE] The comments already shows that super block can be easily fixed by committing a transaction: /* * If we find an error in a super block, we just report it. * They will get written with the next transaction commit * anyway */ But the truth is, such assumption is not always true, and since scrub should try to repair every error it found (except for read-only scrub), we should really actively commit a transaction to fix this. [FIX] Just commit a transaction if we found any super block errors, after everything else is done. We cannot do this just after scrub_supers(), as btrfs_commit_transaction() will try to pause and wait for the running scrub, thus we can not call it with scrub_lock hold. Signed-off-by: Qu Wenruo <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent e69bf81 commit f9eab5f

File tree

1 file changed

+36
-0
lines changed

1 file changed

+36
-0
lines changed

fs/btrfs/scrub.c

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4093,6 +4093,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
40934093
int ret;
40944094
struct btrfs_device *dev;
40954095
unsigned int nofs_flag;
4096+
bool need_commit = false;
40964097

40974098
if (btrfs_fs_closing(fs_info))
40984099
return -EAGAIN;
@@ -4196,6 +4197,12 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
41964197
*/
41974198
nofs_flag = memalloc_nofs_save();
41984199
if (!is_dev_replace) {
4200+
u64 old_super_errors;
4201+
4202+
spin_lock(&sctx->stat_lock);
4203+
old_super_errors = sctx->stat.super_errors;
4204+
spin_unlock(&sctx->stat_lock);
4205+
41994206
btrfs_info(fs_info, "scrub: started on devid %llu", devid);
42004207
/*
42014208
* by holding device list mutex, we can
@@ -4204,6 +4211,16 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
42044211
mutex_lock(&fs_info->fs_devices->device_list_mutex);
42054212
ret = scrub_supers(sctx, dev);
42064213
mutex_unlock(&fs_info->fs_devices->device_list_mutex);
4214+
4215+
spin_lock(&sctx->stat_lock);
4216+
/*
4217+
* Super block errors found, but we can not commit transaction
4218+
* at current context, since btrfs_commit_transaction() needs
4219+
* to pause the current running scrub (hold by ourselves).
4220+
*/
4221+
if (sctx->stat.super_errors > old_super_errors && !sctx->readonly)
4222+
need_commit = true;
4223+
spin_unlock(&sctx->stat_lock);
42074224
}
42084225

42094226
if (!ret)
@@ -4230,6 +4247,25 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
42304247
scrub_workers_put(fs_info);
42314248
scrub_put_ctx(sctx);
42324249

4250+
/*
4251+
* We found some super block errors before, now try to force a
4252+
* transaction commit, as scrub has finished.
4253+
*/
4254+
if (need_commit) {
4255+
struct btrfs_trans_handle *trans;
4256+
4257+
trans = btrfs_start_transaction(fs_info->tree_root, 0);
4258+
if (IS_ERR(trans)) {
4259+
ret = PTR_ERR(trans);
4260+
btrfs_err(fs_info,
4261+
"scrub: failed to start transaction to fix super block errors: %d", ret);
4262+
return ret;
4263+
}
4264+
ret = btrfs_commit_transaction(trans);
4265+
if (ret < 0)
4266+
btrfs_err(fs_info,
4267+
"scrub: failed to commit transaction to fix super block errors: %d", ret);
4268+
}
42334269
return ret;
42344270
out:
42354271
scrub_workers_put(fs_info);

0 commit comments

Comments
 (0)