From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from aserp1040.oracle.com ([141.146.126.69]:38111 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751519AbdJIDIE (ORCPT ); Sun, 8 Oct 2017 23:08:04 -0400 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v99383ml028174 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 9 Oct 2017 03:08:04 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v99383g6031618 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 9 Oct 2017 03:08:03 GMT Received: from abhmp0010.oracle.com (abhmp0010.oracle.com [141.146.116.16]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v99383sR014257 for ; Mon, 9 Oct 2017 03:08:03 GMT From: Anand Jain To: linux-btrfs@vger.kernel.org Subject: [PATCH v2 1/4] btrfs: add_missing_dev() should return the actual error Date: Mon, 9 Oct 2017 11:07:43 +0800 Message-Id: <20171009030746.16680-1-anand.jain@oracle.com> Sender: linux-btrfs-owner@vger.kernel.org List-ID: 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 --- 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); btrfs_report_missing_device(fs_info, devid, dev_uuid); } else { if (!device->bdev) { -- 2.7.0