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

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

btrfs: make open_ctree() return int 



It returns either ERR_PTR(-ve) or sb->s_fs_info.  The latter can
be found by caller just as well, TYVM, no need to return it.  Just
return -ve or 0...

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

fs/btrfs/disk-io.c

+6 −6
Original line number Diff line number Diff line
@@ -1880,7 +1880,7 @@ static void free_root_pointers(struct btrfs_fs_info *info, int chunk_root) 
}





struct btrfs_root *open_ctree(struct super_block *sb,

int open_ctree(struct super_block *sb,

	       struct btrfs_fs_devices *fs_devices,

	       char *options)

{
@@ -2428,11 +2428,11 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
		if (err) {

			close_ctree(tree_root);

			free_fs_info(fs_info);

			return ERR_PTR(err);

			return err;

		}

	}



	return tree_root;

	return 0;



fail_trans_kthread:

	kthread_stop(fs_info->transaction_kthread);
@@ -2479,7 +2479,7 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
fail:

	btrfs_close_devices(fs_info->fs_devices);

	free_fs_info(fs_info);

	return ERR_PTR(err);

	return err;



recovery_tree_root:

	if (!btrfs_test_opt(tree_root, RECOVERY))

fs/btrfs/disk-io.h

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root, 
						   u64 bytenr, u32 blocksize);

int clean_tree_block(struct btrfs_trans_handle *trans,

		     struct btrfs_root *root, struct extent_buffer *buf);

struct btrfs_root *open_ctree(struct super_block *sb,

int open_ctree(struct super_block *sb,

	       struct btrfs_fs_devices *fs_devices,

	       char *options);

int close_ctree(struct btrfs_root *root);

fs/btrfs/super.c

+4 −4
Original line number Diff line number Diff line
@@ -604,12 +604,12 @@ static int btrfs_fill_super(struct super_block *sb, 
	sb->s_flags |= MS_POSIXACL;

#endif



	tree_root = open_ctree(sb, fs_devices, (char *)data);



	if (IS_ERR(tree_root)) {

	err = open_ctree(sb, fs_devices, (char *)data);

	if (err) {

		printk("btrfs: open_ctree failed\n");

		return PTR_ERR(tree_root);

		return err;

	}

	tree_root = sb->s_fs_info;

	fs_info = tree_root->fs_info;

	sb->s_fs_info = tree_root;