hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs: fix use of error or warning for missing device 

When device is missing without the -o degraded option then its an error
so report it as an error instead of a warning.  And when -o degraded
option is provided, log the missing device as warning.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
[ switch error to bool ]
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain 2017-10-09 11:07:46 +08:00 committed by David Sterba
parent 5a2b8e601c
commit 2b902dfc89
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/btrfs/volumes.c
View File

@ -6367,9 +6367,14 @@ static int btrfs_check_chunk_valid(struct btrfs_fs_info *fs_info,
} }
static void btrfs_report_missing_device(struct btrfs_fs_info *fs_info, static void btrfs_report_missing_device(struct btrfs_fs_info *fs_info,
u64 devid, u8 *uuid) u64 devid, u8 *uuid, bool error)
{ {
btrfs_warn_rl(fs_info, "devid %llu uuid %pU is missing", devid, uuid); if (error)
btrfs_err_rl(fs_info, "devid %llu uuid %pU is missing",
devid, uuid);
else
btrfs_warn_rl(fs_info, "devid %llu uuid %pU is missing",
devid, uuid);
} }
static int read_one_chunk(struct btrfs_fs_info *fs_info, struct btrfs_key *key, static int read_one_chunk(struct btrfs_fs_info *fs_info, struct btrfs_key *key,
@ -6442,7 +6447,7 @@ static int read_one_chunk(struct btrfs_fs_info *fs_info, struct btrfs_key *key,
if (!map->stripes[i].dev && if (!map->stripes[i].dev &&
!btrfs_test_opt(fs_info, DEGRADED)) { !btrfs_test_opt(fs_info, DEGRADED)) {
free_extent_map(em); free_extent_map(em);
btrfs_report_missing_device(fs_info, devid, uuid); btrfs_report_missing_device(fs_info, devid, uuid, true);
return -ENOENT; return -ENOENT;
} }
if (!map->stripes[i].dev) { if (!map->stripes[i].dev) {
@ -6456,7 +6461,7 @@ static int read_one_chunk(struct btrfs_fs_info *fs_info, struct btrfs_key *key,
devid, PTR_ERR(map->stripes[i].dev)); devid, PTR_ERR(map->stripes[i].dev));
return PTR_ERR(map->stripes[i].dev); return PTR_ERR(map->stripes[i].dev);
} }
btrfs_report_missing_device(fs_info, devid, uuid); btrfs_report_missing_device(fs_info, devid, uuid, false);
} }
map->stripes[i].dev->in_fs_metadata = 1; map->stripes[i].dev->in_fs_metadata = 1;
} }
@ -6575,7 +6580,8 @@ static int read_one_dev(struct btrfs_fs_info *fs_info,
device = btrfs_find_device(fs_info, devid, dev_uuid, fs_uuid); device = btrfs_find_device(fs_info, devid, dev_uuid, fs_uuid);
if (!device) { if (!device) {
if (!btrfs_test_opt(fs_info, DEGRADED)) { if (!btrfs_test_opt(fs_info, DEGRADED)) {
btrfs_report_missing_device(fs_info, devid, dev_uuid); btrfs_report_missing_device(fs_info, devid,
dev_uuid, true);
return -ENOENT; return -ENOENT;
} }
@ -6586,12 +6592,16 @@ static int read_one_dev(struct btrfs_fs_info *fs_info,
devid, PTR_ERR(device)); devid, PTR_ERR(device));
return PTR_ERR(device); return PTR_ERR(device);
} }
btrfs_report_missing_device(fs_info, devid, dev_uuid); btrfs_report_missing_device(fs_info, devid, dev_uuid, false);
} else { } else {
if (!device->bdev) { if (!device->bdev) {
btrfs_report_missing_device(fs_info, devid, dev_uuid); if (!btrfs_test_opt(fs_info, DEGRADED)) {
if (!btrfs_test_opt(fs_info, DEGRADED)) btrfs_report_missing_device(fs_info,
devid, dev_uuid, true);
return -ENOENT; return -ENOENT;
}
btrfs_report_missing_device(fs_info, devid,
dev_uuid, false);
} }
if(!device->bdev && !device->missing) { if(!device->bdev && !device->missing) {