Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be7e0950 authored by Al Viro's avatar Al Viro
Browse files

btrfs: merge free_fs_info() calls on fill_super failures 



... all the way up into btrfs_mount().

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 29db78aa

fs/btrfs/disk-io.c

+0 −2
Original line number Diff line number Diff line
@@ -2427,7 +2427,6 @@ int open_ctree(struct super_block *sb, 
		up_read(&fs_info->cleanup_work_sem);

		if (err) {

			close_ctree(tree_root);

			free_fs_info(fs_info);

			return err;

		}

	}
@@ -2478,7 +2477,6 @@ int open_ctree(struct super_block *sb, 
	cleanup_srcu_struct(&fs_info->subvol_srcu);

fail:

	btrfs_close_devices(fs_info->fs_devices);

	free_fs_info(fs_info);

	return err;



recovery_tree_root:

fs/btrfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,6 @@ static int btrfs_fill_super(struct super_block *sb, 


fail_close:

	close_ctree(tree_root);

	free_fs_info(fs_info);

	return err;

}
@@ -947,6 +946,7 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags, 
		error = btrfs_fill_super(s, fs_devices, data,

					 flags & MS_SILENT ? 1 : 0);

		if (error) {

			free_fs_info(fs_info);

			deactivate_locked_super(s);

			return ERR_PTR(error);

		}