From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 2/2] btrfs: fix error return on alloc fail in clone_fs_devices
Date: Tue, 27 Aug 2019 15:40:45 +0800 [thread overview]
Message-ID: <20190827074045.5563-3-anand.jain@oracle.com> (raw)
In-Reply-To: <20190827074045.5563-1-anand.jain@oracle.com>
Fix the fake ENOMEM return error code to the actual error in
clone_fs_devices().
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/volumes.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 36aa5f79fb6c..8d72098ccb4b 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1115,6 +1115,7 @@ static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig)
struct btrfs_fs_devices *fs_devices;
struct btrfs_device *device;
struct btrfs_device *orig_dev;
+ int ret = 0;
fs_devices = alloc_fs_devices(orig->fsid, NULL);
if (IS_ERR(fs_devices))
@@ -1128,8 +1129,10 @@ static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig)
device = btrfs_alloc_device(NULL, &orig_dev->devid,
orig_dev->uuid);
- if (IS_ERR(device))
+ if (IS_ERR(device)) {
+ ret = PTR_ERR(device);
goto error;
+ }
/*
* This is ok to do without rcu read locked because we hold the
@@ -1140,6 +1143,7 @@ static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig)
GFP_KERNEL);
if (!name) {
btrfs_free_device(device);
+ ret = -ENOMEM;
goto error;
}
rcu_assign_pointer(device->name, name);
@@ -1154,7 +1158,7 @@ static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig)
error:
mutex_unlock(&orig->device_list_mutex);
free_fs_devices(fs_devices);
- return ERR_PTR(-ENOMEM);
+ return ERR_PTR(ret);
}
/*
--
2.21.0 (Apple Git-120)
next prev parent reply other threads:[~2019-08-27 7:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 7:40 [PATCH 0/2] fix BUG_ON and retun real error in find_next_devid() and clone_fs_devices() Anand Jain
2019-08-27 7:40 ` [PATCH 1/2] btrfs: fix BUG_ON with proper error handle in find_next_devid Anand Jain
2019-08-27 8:07 ` Johannes Thumshirn
2019-08-27 8:12 ` Qu Wenruo
2019-08-27 9:58 ` Anand Jain
2019-08-27 11:11 ` Qu Wenruo
2019-08-27 7:40 ` Anand Jain [this message]
2019-08-27 8:12 ` [PATCH 2/2] btrfs: fix error return on alloc fail in clone_fs_devices Johannes Thumshirn
2019-08-27 7:59 ` [PATCH 0/2] fix BUG_ON and retun real error in find_next_devid() and clone_fs_devices() Nikolay Borisov
2019-08-27 13:25 ` David Sterba
2019-08-27 13:28 ` Nikolay Borisov
2019-08-27 23:12 ` Anand Jain
2019-09-10 8:57 ` Anand Jain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190827074045.5563-3-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).