Commit 9907ab37 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs fixes from David Sterba:

 - fix swapfile activation on subvolumes with deleted snapshots

 - error value mixup when removing directory entries from tree log

 - fix lzo compression level reset after previous level setting

 - fix space cache memory leak after transaction abort

 - fix const function attribute

 - more error handling improvements

* tag 'for-5.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: detect nocow for swap after snapshot delete
  btrfs: check the right error variable in btrfs_del_dir_entries_in_log
  btrfs: fix space cache memory leak after transaction abort
  btrfs: use the correct const function attribute for btrfs_get_num_csums
  btrfs: reset compression level for lzo on remount
  btrfs: handle errors from async submission
parents c41c3ec4 a84d5d42

fs/btrfs/ctree.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ const char *btrfs_super_csum_driver(u16 csum_type) 
		btrfs_csums[csum_type].name;

}



size_t __const btrfs_get_num_csums(void)

size_t __attribute_const__ btrfs_get_num_csums(void)

{

	return ARRAY_SIZE(btrfs_csums);

}

fs/btrfs/ctree.h

+3 −3
Original line number Diff line number Diff line
@@ -2262,7 +2262,7 @@ BTRFS_SETGET_STACK_FUNCS(super_uuid_tree_generation, struct btrfs_super_block, 
int btrfs_super_csum_size(const struct btrfs_super_block *s);

const char *btrfs_super_csum_name(u16 csum_type);

const char *btrfs_super_csum_driver(u16 csum_type);

size_t __const btrfs_get_num_csums(void);

size_t __attribute_const__ btrfs_get_num_csums(void);





/*
@@ -2518,7 +2518,7 @@ int btrfs_pin_extent_for_log_replay(struct btrfs_trans_handle *trans, 
				    u64 bytenr, u64 num_bytes);

int btrfs_exclude_logged_extents(struct extent_buffer *eb);

int btrfs_cross_ref_exist(struct btrfs_root *root,

			  u64 objectid, u64 offset, u64 bytenr);

			  u64 objectid, u64 offset, u64 bytenr, bool strict);

struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,

					     struct btrfs_root *root,

					     u64 parent, u64 root_objectid,
@@ -2934,7 +2934,7 @@ struct extent_map *btrfs_get_extent_fiemap(struct btrfs_inode *inode, 
					   u64 start, u64 len);

noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,

			      u64 *orig_start, u64 *orig_block_len,

			      u64 *ram_bytes);

			      u64 *ram_bytes, bool strict);



void __btrfs_del_delalloc_inode(struct btrfs_root *root,

				struct btrfs_inode *inode);

fs/btrfs/disk-io.c

+1 −0
Original line number Diff line number Diff line
@@ -4551,6 +4551,7 @@ static void btrfs_cleanup_bg_io(struct btrfs_block_group *cache) 
		cache->io_ctl.inode = NULL;

		iput(inode);

	}

	ASSERT(cache->io_ctl.pages == NULL);

	btrfs_put_block_group(cache);

}

fs/btrfs/extent-tree.c

+11 −6
Original line number Diff line number Diff line
@@ -2306,7 +2306,8 @@ static noinline int check_delayed_ref(struct btrfs_root *root, 


static noinline int check_committed_ref(struct btrfs_root *root,

					struct btrfs_path *path,

					u64 objectid, u64 offset, u64 bytenr)

					u64 objectid, u64 offset, u64 bytenr,

					bool strict)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct btrfs_root *extent_root = fs_info->extent_root;
@@ -2348,9 +2349,13 @@ static noinline int check_committed_ref(struct btrfs_root *root, 
	    btrfs_extent_inline_ref_size(BTRFS_EXTENT_DATA_REF_KEY))

		goto out;



	/* If extent created before last snapshot => it's definitely shared */

	if (btrfs_extent_generation(leaf, ei) <=

	    btrfs_root_last_snapshot(&root->root_item))

	/*

	 * If extent created before last snapshot => it's shared unless the

	 * snapshot has been deleted. Use the heuristic if strict is false.

	 */

	if (!strict &&

	    (btrfs_extent_generation(leaf, ei) <=

	     btrfs_root_last_snapshot(&root->root_item)))

		goto out;



	iref = (struct btrfs_extent_inline_ref *)(ei + 1);
@@ -2375,7 +2380,7 @@ out: 
}



int btrfs_cross_ref_exist(struct btrfs_root *root, u64 objectid, u64 offset,

			  u64 bytenr)

			  u64 bytenr, bool strict)

{

	struct btrfs_path *path;

	int ret;
@@ -2386,7 +2391,7 @@ int btrfs_cross_ref_exist(struct btrfs_root *root, u64 objectid, u64 offset, 


	do {

		ret = check_committed_ref(root, path, objectid,

					  offset, bytenr);

					  offset, bytenr, strict);

		if (ret && ret != -ENOENT)

			goto out;

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1571,7 +1571,7 @@ static int check_can_nocow(struct btrfs_inode *inode, loff_t pos, 
	}



	ret = can_nocow_extent(&inode->vfs_inode, lockstart, &num_bytes,

			NULL, NULL, NULL);

			NULL, NULL, NULL, false);

	if (ret <= 0) {

		ret = 0;

		if (!nowait)

CRA Git | Maintained and supported by SUSTech CRA and CCSE