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 <[email protected]>
Reviewed-by: David Sterba <[email protected]>
Signed-off-by: Chris Mason <[email protected]>

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 38d3a0f3bcdde3435f731da83b673610ba4694c3..403ed1fdd901ae38a991f4711b5108bb49775903 100644 (file)
--- 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;