[PATCH v3 2/2] btrfs: fix BUG_ON in btrfs_init_new_device()

[Anand Jain]

Instead of BUG_ON return error to the caller. And handle the fail
condition by calling the abort transaction and going through the
error path.

Signed-off-by: Anand Jain <anand.j...@oracle.com>
---
v2: do not consolidate btrfs_abort_transaction()
v3: meld 2/3 and 3/3 from v2

 fs/btrfs/volumes.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 9d64700cc9b6..4cb575fbf643 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2399,7 +2399,10 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, 
const char *device_path
        if (seeding_dev) {
                sb->s_flags &= ~MS_RDONLY;
                ret = btrfs_prepare_sprout(fs_info);
-               BUG_ON(ret); /* -ENOMEM */
+               if (ret) {
+                       btrfs_abort_transaction(trans, ret);
+                       goto error_trans;
+               }
        }
 
        device->fs_devices = fs_info->fs_devices;
@@ -2445,14 +2448,14 @@ int btrfs_init_new_device(struct btrfs_fs_info 
*fs_info, const char *device_path
                mutex_unlock(&fs_info->chunk_mutex);
                if (ret) {
                        btrfs_abort_transaction(trans, ret);
-                       goto error_trans;
+                       goto error_sysfs;
                }
        }
 
        ret = btrfs_add_device(trans, fs_info, device);
        if (ret) {
                btrfs_abort_transaction(trans, ret);
-               goto error_trans;
+               goto error_sysfs;
        }
 
        if (seeding_dev) {
@@ -2461,7 +2464,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, 
const char *device_path
                ret = btrfs_finish_sprout(trans, fs_info);
                if (ret) {
                        btrfs_abort_transaction(trans, ret);
-                       goto error_trans;
+                       goto error_sysfs;
                }
 
                /* Sprouting would change fsid of the mounted root,
@@ -2500,12 +2503,13 @@ int btrfs_init_new_device(struct btrfs_fs_info 
*fs_info, const char *device_path
        update_dev_time(device_path);
        return ret;
 
+error_sysfs:
+       btrfs_sysfs_rm_device_link(fs_info->fs_devices, device);
 error_trans:
        if (seeding_dev)
                sb->s_flags |= MS_RDONLY;
        btrfs_end_transaction(trans);
        rcu_string_free(device->name);
-       btrfs_sysfs_rm_device_link(fs_info->fs_devices, device);
        kfree(device);
 error:
        blkdev_put(bdev, FMODE_EXCL);
-- 
2.13.1

--
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