summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnand Jain2015-05-07 22:34:35 +0200
committerChris Mason2015-06-03 04:34:35 +0200
commit33b97e43279a60729eee502809cf5269b3a64cf3 (patch)
tree8d6bcad7d71e777253b1ab1890900b7ef8938efd
parentbtrfs: Fix superblock csum type check. (diff)
downloadkernel-qcow2-linux-33b97e43279a60729eee502809cf5269b3a64cf3.tar.gz
kernel-qcow2-linux-33b97e43279a60729eee502809cf5269b3a64cf3.tar.xz
kernel-qcow2-linux-33b97e43279a60729eee502809cf5269b3a64cf3.zip
Btrfs: check error before reporting missing device and add uuid
Report missing device when add is successful, otherwise it would exit as ENOMEM. And add uuid to the report. Signed-off-by: Anand Jain <anand.jain@oracle.com> Reviewed-by: David Sterba <dsterba@suse.cz> Signed-off-by: Chris Mason <clm@fb.com>
-rw-r--r--fs/btrfs/volumes.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 38d3a0f3bcdd..403ed1fdd901 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -6230,10 +6230,11 @@ static int read_one_dev(struct btrfs_root *root,
if (!btrfs_test_opt(root, DEGRADED))
return -EIO;
- btrfs_warn(root->fs_info, "devid %llu missing", devid);
device = add_missing_dev(root, fs_devices, devid, dev_uuid);
if (!device)
return -ENOMEM;
+ btrfs_warn(root->fs_info, "devid %llu uuid %pU missing",
+ devid, dev_uuid);
} else {
if (!device->bdev && !btrfs_test_opt(root, DEGRADED))
return -EIO;