On Mon, Oct 09, 2017 at 11:07:43AM +0800, Anand Jain wrote: > add_missing_dev() can return device pointer so that IS_ERR/ > PTR_ERR can be used to check for the actual error occurred > in the function. > > Signed-off-by: Anand Jain <anand.j...@oracle.com> > --- > v2: This patch is a split from > [PATCH 1/2] btrfs: fix read_one_chunk() return error code > > fs/btrfs/volumes.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > > diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c > index 0e8f16c305df..2f500a32089e 100644 > --- a/fs/btrfs/volumes.c > +++ b/fs/btrfs/volumes.c > @@ -6249,7 +6249,7 @@ static struct btrfs_device *add_missing_dev(struct > btrfs_fs_devices *fs_devices, > > device = btrfs_alloc_device(NULL, &devid, dev_uuid); > if (IS_ERR(device)) > - return NULL; > + return device; > > list_add(&device->dev_list, &fs_devices->devices); > device->fs_devices = fs_devices; > @@ -6454,9 +6454,12 @@ static int read_one_chunk(struct btrfs_fs_info > *fs_info, struct btrfs_key *key, > map->stripes[i].dev = > add_missing_dev(fs_info->fs_devices, devid, > uuid); > - if (!map->stripes[i].dev) { > + if (IS_ERR(map->stripes[i].dev)) { > free_extent_map(em); > - return -EIO; > + btrfs_err(fs_info, > + "failed to init missing dev %llu %ld", > + devid, PTR_ERR(map->stripes[i].dev)); > + return PTR_ERR(map->stripes[i].dev); > } > btrfs_report_missing_device(fs_info, devid, uuid); > } > @@ -6582,8 +6585,8 @@ static int read_one_dev(struct btrfs_fs_info *fs_info, > } > > device = add_missing_dev(fs_devices, devid, dev_uuid); > - if (!device) > - return -ENOMEM; > + if (IS_ERR(device)) > + return PTR_ERR(device);
Could you please also add a btrfs_err() like above? With that, Reviewed-by: Liu Bo <bo.li....@oracle.com> -liubo > btrfs_report_missing_device(fs_info, devid, dev_uuid); > } else { > if (!device->bdev) { > -- > 2.7.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html