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

Merge tag 'for-5.9-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs fixes from David Sterba:
 "Two small fixes and a bunch of lockdep fixes for warnings that show up
  with an upcoming tree locking update but are valid with current locks
  as well"

* tag 'for-5.9-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: tree-checker: fix the error message for transid error
  btrfs: set the lockdep class for log tree extent buffers
  btrfs: set the correct lockdep class for new nodes
  btrfs: allocate scrub workqueues outside of locks
  btrfs: fix potential deadlock in the search ioctl
  btrfs: drop path before adding new uuid tree entry
  btrfs: block-group: fix free-space bitmap threshold
parents b765a32a f96d6960

fs/btrfs/block-group.c

+3 −1
Original line number Diff line number Diff line
@@ -1798,7 +1798,6 @@ static struct btrfs_block_group *btrfs_create_block_group_cache( 


	cache->fs_info = fs_info;

	cache->full_stripe_len = btrfs_full_stripe_len(fs_info, start);

	set_free_space_tree_thresholds(cache);



	cache->discard_index = BTRFS_DISCARD_INDEX_UNUSED;
@@ -1912,6 +1911,8 @@ static int read_one_block_group(struct btrfs_fs_info *info, 
	if (ret < 0)

		goto error;



	set_free_space_tree_thresholds(cache);



	if (need_clear) {

		/*

		 * When we mount with old space cache, we need to
@@ -2132,6 +2133,7 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 bytes_used, 
		return -ENOMEM;



	cache->length = size;

	set_free_space_tree_thresholds(cache);

	cache->used = bytes_used;

	cache->flags = type;

	cache->last_byte_to_unpin = (u64)-1;

fs/btrfs/ctree.c

+5 −1
Original line number Diff line number Diff line
@@ -1297,6 +1297,8 @@ tree_mod_log_rewind(struct btrfs_fs_info *fs_info, struct btrfs_path *path, 
	btrfs_tree_read_unlock_blocking(eb);

	free_extent_buffer(eb);



	btrfs_set_buffer_lockdep_class(btrfs_header_owner(eb_rewin),

				       eb_rewin, btrfs_header_level(eb_rewin));

	btrfs_tree_read_lock(eb_rewin);

	__tree_mod_log_rewind(fs_info, eb_rewin, time_seq, tm);

	WARN_ON(btrfs_header_nritems(eb_rewin) >
@@ -1370,7 +1372,6 @@ get_old_root(struct btrfs_root *root, u64 time_seq) 


	if (!eb)

		return NULL;

	btrfs_tree_read_lock(eb);

	if (old_root) {

		btrfs_set_header_bytenr(eb, eb->start);

		btrfs_set_header_backref_rev(eb, BTRFS_MIXED_BACKREF_REV);
@@ -1378,6 +1379,9 @@ get_old_root(struct btrfs_root *root, u64 time_seq) 
		btrfs_set_header_level(eb, old_root->level);

		btrfs_set_header_generation(eb, old_generation);

	}

	btrfs_set_buffer_lockdep_class(btrfs_header_owner(eb), eb,

				       btrfs_header_level(eb));

	btrfs_tree_read_lock(eb);

	if (tm)

		__tree_mod_log_rewind(fs_info, eb, time_seq, tm);

	else

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -4527,7 +4527,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
		return ERR_PTR(-EUCLEAN);

	}



	btrfs_set_buffer_lockdep_class(root->root_key.objectid, buf, level);

	btrfs_set_buffer_lockdep_class(owner, buf, level);

	btrfs_tree_lock(buf);

	btrfs_clean_tree_block(buf);

	clear_bit(EXTENT_BUFFER_STALE, &buf->bflags);

fs/btrfs/extent_io.c

+4 −4
Original line number Diff line number Diff line
@@ -5655,7 +5655,7 @@ void read_extent_buffer(const struct extent_buffer *eb, void *dstv, 
	}

}



int read_extent_buffer_to_user(const struct extent_buffer *eb,

int read_extent_buffer_to_user_nofault(const struct extent_buffer *eb,

				       void __user *dstv,

				       unsigned long start, unsigned long len)

{
@@ -5677,7 +5677,7 @@ int read_extent_buffer_to_user(const struct extent_buffer *eb, 


		cur = min(len, (PAGE_SIZE - offset));

		kaddr = page_address(page);

		if (copy_to_user(dst, kaddr + offset, cur)) {

		if (copy_to_user_nofault(dst, kaddr + offset, cur)) {

			ret = -EFAULT;

			break;

		}

fs/btrfs/extent_io.h

+3 −3
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ int memcmp_extent_buffer(const struct extent_buffer *eb, const void *ptrv, 
void read_extent_buffer(const struct extent_buffer *eb, void *dst,

			unsigned long start,

			unsigned long len);

int read_extent_buffer_to_user(const struct extent_buffer *eb,

int read_extent_buffer_to_user_nofault(const struct extent_buffer *eb,

				       void __user *dst, unsigned long start,

				       unsigned long len);

void write_extent_buffer_fsid(const struct extent_buffer *eb, const void *src);

CRA Git | Maintained and supported by SUSTech CRA and CCSE