1 files changed, 6 insertions, 2 deletions

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index c7a08fe26672..8bfc41f1b3b6 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);
 }
 
 /*