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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs 

Pull btrfs fixes from Chris Mason:
 "We've got more bug fixes in my for-linus branch:

  One of these fixes another corner of the compression oops from last
  time.  Miao nailed down some problems with concurrent snapshot
  deletion and drive balancing.

  I kept out one of his patches for more testing, but these are all
  stable"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: fix oops caused by the space balance and dead roots
  Btrfs: insert orphan roots into fs radix tree
  Btrfs: limit delalloc pages outside of find_delalloc_range
  Btrfs: use right root when checking for hash collision
parents d192f0d5 c00869f1

fs/btrfs/disk-io.c

+5 −4
Original line number Diff line number Diff line
@@ -1561,8 +1561,9 @@ int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info, 
	return ret;

}



struct btrfs_root *btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info,

					      struct btrfs_key *location)

struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info,

				     struct btrfs_key *location,

				     bool check_ref)

{

	struct btrfs_root *root;

	int ret;
@@ -1586,7 +1587,7 @@ struct btrfs_root *btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info, 
again:

	root = btrfs_lookup_fs_root(fs_info, location->objectid);

	if (root) {

		if (btrfs_root_refs(&root->root_item) == 0)

		if (check_ref && btrfs_root_refs(&root->root_item) == 0)

			return ERR_PTR(-ENOENT);

		return root;

	}
@@ -1595,7 +1596,7 @@ again: 
	if (IS_ERR(root))

		return root;



	if (btrfs_root_refs(&root->root_item) == 0) {

	if (check_ref && btrfs_root_refs(&root->root_item) == 0) {

		ret = -ENOENT;

		goto fail;

	}

fs/btrfs/disk-io.h

+11 −2
Original line number Diff line number Diff line
@@ -68,8 +68,17 @@ struct btrfs_root *btrfs_read_fs_root(struct btrfs_root *tree_root, 
int btrfs_init_fs_root(struct btrfs_root *root);

int btrfs_insert_fs_root(struct btrfs_fs_info *fs_info,

			 struct btrfs_root *root);

struct btrfs_root *btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info,

					      struct btrfs_key *location);



struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info,

				     struct btrfs_key *key,

				     bool check_ref);

static inline struct btrfs_root *

btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info,

			   struct btrfs_key *location)

{

	return btrfs_get_fs_root(fs_info, location, true);

}



int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info);

void btrfs_btree_balance_dirty(struct btrfs_root *root);

void btrfs_btree_balance_dirty_nodelay(struct btrfs_root *root);

fs/btrfs/extent_io.c

+4 −8
Original line number Diff line number Diff line
@@ -1490,10 +1490,8 @@ static noinline u64 find_delalloc_range(struct extent_io_tree *tree, 
		cur_start = state->end + 1;

		node = rb_next(node);

		total_bytes += state->end - state->start + 1;

		if (total_bytes >= max_bytes) {

			*end = *start + max_bytes - 1;

		if (total_bytes >= max_bytes)

			break;

		}

		if (!node)

			break;

	}
@@ -1635,10 +1633,9 @@ again: 


	/*

	 * make sure to limit the number of pages we try to lock down

	 * if we're looping.

	 */

	if (delalloc_end + 1 - delalloc_start > max_bytes && loops)

		delalloc_end = delalloc_start + PAGE_CACHE_SIZE - 1;

	if (delalloc_end + 1 - delalloc_start > max_bytes)

		delalloc_end = delalloc_start + max_bytes - 1;



	/* step two, lock all the pages after the page that has start */

	ret = lock_delalloc_pages(inode, locked_page,
@@ -1649,8 +1646,7 @@ again: 
		 */

		free_extent_state(cached_state);

		if (!loops) {

			unsigned long offset = (*start) & (PAGE_CACHE_SIZE - 1);

			max_bytes = PAGE_CACHE_SIZE - offset;

			max_bytes = PAGE_CACHE_SIZE;

			loops = 1;

			goto again;

		} else {

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -7986,7 +7986,7 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, 




	/* check for collisions, even if the  name isn't there */

	ret = btrfs_check_dir_item_collision(root, new_dir->i_ino,

	ret = btrfs_check_dir_item_collision(dest, new_dir->i_ino,

			     new_dentry->d_name.name,

			     new_dentry->d_name.len);

fs/btrfs/relocation.c

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ static struct btrfs_root *read_fs_root(struct btrfs_fs_info *fs_info, 
	else

		key.offset = (u64)-1;



	return btrfs_read_fs_root_no_name(fs_info, &key);

	return btrfs_get_fs_root(fs_info, &key, false);

}



#ifdef BTRFS_COMPAT_EXTENT_TREE_V0