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

Commit d65773b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'btrfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

* 'btrfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  btrfs: take allocation of ->tree_root into open_ctree()
  btrfs: let ->s_fs_info point to fs_info, not root...
  btrfs: consolidate failure exits in btrfs_mount() a bit
  btrfs: make free_fs_info() call ->kill_sb() unconditional
  btrfs: merge free_fs_info() calls on fill_super failures
  btrfs: kill pointless reassignment of ->s_fs_info in btrfs_fill_super()
  btrfs: make open_ctree() return int
  btrfs: sanitizing ->fs_info, part 5
  btrfs: sanitizing ->fs_info, part 4
  btrfs: sanitizing ->fs_info, part 3
  btrfs: sanitizing ->fs_info, part 2
  btrfs: sanitizing ->fs_info, part 1
  btrfs: fix a deadlock in btrfs_scan_one_device()
  btrfs: fix mount/umount race
  btrfs: get ->kill_sb() of its own
  btrfs: preparation to fixing mount/umount race
parents f9156c72 f84a8bd6

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -2364,7 +2364,7 @@ static inline u32 btrfs_file_extent_inline_item_len(struct extent_buffer *eb, 
	return btrfs_item_size(eb, e) - offset;

}



static inline struct btrfs_root *btrfs_sb(struct super_block *sb)

static inline struct btrfs_fs_info *btrfs_sb(struct super_block *sb)

{

	return sb->s_fs_info;

}

fs/btrfs/disk-io.c

+36 −34
Original line number Diff line number Diff line
@@ -1144,7 +1144,6 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize, 
	root->orphan_item_inserted = 0;

	root->orphan_cleanup_state = 0;



	root->fs_info = fs_info;

	root->objectid = objectid;

	root->last_trans = 0;

	root->highest_objectid = 0;
@@ -1218,6 +1217,14 @@ static int find_and_setup_root(struct btrfs_root *tree_root, 
	return 0;

}



static struct btrfs_root *btrfs_alloc_root(struct btrfs_fs_info *fs_info)

{

	struct btrfs_root *root = kzalloc(sizeof(*root), GFP_NOFS);

	if (root)

		root->fs_info = fs_info;

	return root;

}



static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans,

					 struct btrfs_fs_info *fs_info)

{
@@ -1225,7 +1232,7 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans, 
	struct btrfs_root *tree_root = fs_info->tree_root;

	struct extent_buffer *leaf;



	root = kzalloc(sizeof(*root), GFP_NOFS);

	root = btrfs_alloc_root(fs_info);

	if (!root)

		return ERR_PTR(-ENOMEM);
@@ -1320,7 +1327,7 @@ struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_root *tree_root, 
	u32 blocksize;

	int ret = 0;



	root = kzalloc(sizeof(*root), GFP_NOFS);

	root = btrfs_alloc_root(fs_info);

	if (!root)

		return ERR_PTR(-ENOMEM);

	if (location->offset == (u64)-1) {
@@ -1876,7 +1883,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)

{
@@ -1890,8 +1897,8 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
	struct btrfs_key location;

	struct buffer_head *bh;

	struct btrfs_super_block *disk_super;

	struct btrfs_root *tree_root = btrfs_sb(sb);

	struct btrfs_fs_info *fs_info = tree_root->fs_info;

	struct btrfs_fs_info *fs_info = btrfs_sb(sb);

	struct btrfs_root *tree_root;

	struct btrfs_root *extent_root;

	struct btrfs_root *csum_root;

	struct btrfs_root *chunk_root;
@@ -1902,16 +1909,14 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
	int num_backups_tried = 0;

	int backup_index = 0;



	extent_root = fs_info->extent_root =

		kzalloc(sizeof(struct btrfs_root), GFP_NOFS);

	csum_root = fs_info->csum_root =

		kzalloc(sizeof(struct btrfs_root), GFP_NOFS);

	chunk_root = fs_info->chunk_root =

		kzalloc(sizeof(struct btrfs_root), GFP_NOFS);

	dev_root = fs_info->dev_root =

		kzalloc(sizeof(struct btrfs_root), GFP_NOFS);

	tree_root = fs_info->tree_root = btrfs_alloc_root(fs_info);

	extent_root = fs_info->extent_root = btrfs_alloc_root(fs_info);

	csum_root = fs_info->csum_root = btrfs_alloc_root(fs_info);

	chunk_root = fs_info->chunk_root = btrfs_alloc_root(fs_info);

	dev_root = fs_info->dev_root = btrfs_alloc_root(fs_info);



	if (!extent_root || !csum_root || !chunk_root || !dev_root) {

	if (!tree_root || !extent_root || !csum_root ||

	    !chunk_root || !dev_root) {

		err = -ENOMEM;

		goto fail;

	}
@@ -2389,7 +2394,7 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
		     btrfs_level_size(tree_root,

				      btrfs_super_log_root_level(disk_super));



		log_tree_root = kzalloc(sizeof(struct btrfs_root), GFP_NOFS);

		log_tree_root = btrfs_alloc_root(fs_info);

		if (!log_tree_root) {

			err = -ENOMEM;

			goto fail_trans_kthread;
@@ -2450,11 +2455,11 @@ struct btrfs_root *open_ctree(struct super_block *sb, 


		if (err) {

			close_ctree(tree_root);

			return ERR_PTR(err);

			return err;

		}

	}



	return tree_root;

	return 0;



fail_trans_kthread:

	kthread_stop(fs_info->transaction_kthread);
@@ -2500,8 +2505,7 @@ struct btrfs_root *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_PTR(err);

	return err;



recovery_tree_root:

	if (!btrfs_test_opt(tree_root, RECOVERY))
@@ -3007,7 +3011,7 @@ int close_ctree(struct btrfs_root *root) 
		   (atomic_read(&fs_info->defrag_running) == 0));



	/* clear out the rbtree of defraggable inodes */

	btrfs_run_defrag_inodes(root->fs_info);

	btrfs_run_defrag_inodes(fs_info);



	/*

	 * Here come 2 situations when btrfs is broken to flip readonly:
@@ -3036,8 +3040,8 @@ int close_ctree(struct btrfs_root *root) 


	btrfs_put_block_group_cache(fs_info);



	kthread_stop(root->fs_info->transaction_kthread);

	kthread_stop(root->fs_info->cleaner_kthread);

	kthread_stop(fs_info->transaction_kthread);

	kthread_stop(fs_info->cleaner_kthread);



	fs_info->closing = 2;

	smp_mb();
@@ -3055,14 +3059,14 @@ int close_ctree(struct btrfs_root *root) 
	free_extent_buffer(fs_info->extent_root->commit_root);

	free_extent_buffer(fs_info->tree_root->node);

	free_extent_buffer(fs_info->tree_root->commit_root);

	free_extent_buffer(root->fs_info->chunk_root->node);

	free_extent_buffer(root->fs_info->chunk_root->commit_root);

	free_extent_buffer(root->fs_info->dev_root->node);

	free_extent_buffer(root->fs_info->dev_root->commit_root);

	free_extent_buffer(root->fs_info->csum_root->node);

	free_extent_buffer(root->fs_info->csum_root->commit_root);

	free_extent_buffer(fs_info->chunk_root->node);

	free_extent_buffer(fs_info->chunk_root->commit_root);

	free_extent_buffer(fs_info->dev_root->node);

	free_extent_buffer(fs_info->dev_root->commit_root);

	free_extent_buffer(fs_info->csum_root->node);

	free_extent_buffer(fs_info->csum_root->commit_root);



	btrfs_free_block_groups(root->fs_info);

	btrfs_free_block_groups(fs_info);



	del_fs_roots(fs_info);
@@ -3093,8 +3097,6 @@ int close_ctree(struct btrfs_root *root) 
	bdi_destroy(&fs_info->bdi);

	cleanup_srcu_struct(&fs_info->subvol_srcu);



	free_fs_info(fs_info);



	return 0;

}

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/export.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid, 
				       u64 root_objectid, u32 generation,

				       int check_generation)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(sb)->fs_info;

	struct btrfs_fs_info *fs_info = btrfs_sb(sb);

	struct btrfs_root *root;

	struct inode *inode;

	struct btrfs_key key;

fs/btrfs/ioctl.c

+3 −4
Original line number Diff line number Diff line
@@ -286,14 +286,13 @@ static int btrfs_ioctl_getversion(struct file *file, int __user *arg) 


static noinline int btrfs_ioctl_fitrim(struct file *file, void __user *arg)

{

	struct btrfs_root *root = fdentry(file)->d_sb->s_fs_info;

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_fs_info *fs_info = btrfs_sb(fdentry(file)->d_sb);

	struct btrfs_device *device;

	struct request_queue *q;

	struct fstrim_range range;

	u64 minlen = ULLONG_MAX;

	u64 num_devices = 0;

	u64 total_bytes = btrfs_super_total_bytes(root->fs_info->super_copy);

	u64 total_bytes = btrfs_super_total_bytes(fs_info->super_copy);

	int ret;



	if (!capable(CAP_SYS_ADMIN))
@@ -322,7 +321,7 @@ static noinline int btrfs_ioctl_fitrim(struct file *file, void __user *arg) 


	range.len = min(range.len, total_bytes - range.start);

	range.minlen = max(range.minlen, minlen);

	ret = btrfs_trim_fs(root, &range);

	ret = btrfs_trim_fs(fs_info->tree_root, &range);

	if (ret < 0)

		return ret;