Commit 21c730d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs fixes from David Sterba:

 - fixes for leaks caused by recently merged patches

 - one build fix

 - a fix to prevent mixing of incompatible features

* tag 'for-5.3-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: don't leak extent_map in btrfs_get_io_geometry()
  btrfs: free checksum hash on in close_ctree
  btrfs: Fix build error while LIBCRC32C is module
  btrfs: inode: Don't compress if NODATASUM or NODATACOW set
parents c92f0380 373c3b80

fs/btrfs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config BTRFS_FS 
	tristate "Btrfs filesystem support"

	select CRYPTO

	select CRYPTO_CRC32C

	select LIBCRC32C

	select ZLIB_INFLATE

	select ZLIB_DEFLATE

	select LZO_COMPRESS

fs/btrfs/disk-io.c

+1 −0
Original line number Diff line number Diff line
@@ -4106,6 +4106,7 @@ void close_ctree(struct btrfs_fs_info *fs_info) 
	percpu_counter_destroy(&fs_info->dev_replace.bio_counter);

	cleanup_srcu_struct(&fs_info->subvol_srcu);



	btrfs_free_csum_hash(fs_info);

	btrfs_free_stripe_hash_table(fs_info);

	btrfs_free_ref_cache(fs_info);

}

fs/btrfs/inode.c

+23 −1
Original line number Diff line number Diff line
@@ -395,10 +395,31 @@ static noinline int add_async_extent(struct async_chunk *cow, 
	return 0;

}



/*

 * Check if the inode has flags compatible with compression

 */

static inline bool inode_can_compress(struct inode *inode)

{

	if (BTRFS_I(inode)->flags & BTRFS_INODE_NODATACOW ||

	    BTRFS_I(inode)->flags & BTRFS_INODE_NODATASUM)

		return false;

	return true;

}



/*

 * Check if the inode needs to be submitted to compression, based on mount

 * options, defragmentation, properties or heuristics.

 */

static inline int inode_need_compress(struct inode *inode, u64 start, u64 end)

{

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);



	if (!inode_can_compress(inode)) {

		WARN(IS_ENABLED(CONFIG_BTRFS_DEBUG),

			KERN_ERR "BTRFS: unexpected compression for ino %llu\n",

			btrfs_ino(BTRFS_I(inode)));

		return 0;

	}

	/* force compress */

	if (btrfs_test_opt(fs_info, FORCE_COMPRESS))

		return 1;
@@ -1631,7 +1652,8 @@ int btrfs_run_delalloc_range(struct inode *inode, struct page *locked_page, 
	} else if (BTRFS_I(inode)->flags & BTRFS_INODE_PREALLOC && !force_cow) {

		ret = run_delalloc_nocow(inode, locked_page, start, end,

					 page_started, 0, nr_written);

	} else if (!inode_need_compress(inode, start, end)) {

	} else if (!inode_can_compress(inode) ||

		   !inode_need_compress(inode, start, end)) {

		ret = cow_file_range(inode, locked_page, start, end, end,

				      page_started, nr_written, 1, NULL);

	} else {

fs/btrfs/volumes.c

+7 −3
Original line number Diff line number Diff line
@@ -5941,6 +5941,7 @@ int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, 
	u64 stripe_len;

	u64 raid56_full_stripe_start = (u64)-1;

	int data_stripes;

	int ret = 0;



	ASSERT(op != BTRFS_MAP_DISCARD);
@@ -5961,8 +5962,8 @@ int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, 
		btrfs_crit(fs_info,

"stripe math has gone wrong, stripe_offset=%llu offset=%llu start=%llu logical=%llu stripe_len=%llu",

			stripe_offset, offset, em->start, logical, stripe_len);

		free_extent_map(em);

		return -EINVAL;

		ret = -EINVAL;

		goto out;

	}



	/* stripe_offset is the offset of this block in its stripe */
@@ -6009,7 +6010,10 @@ int btrfs_get_io_geometry(struct btrfs_fs_info *fs_info, enum btrfs_map_op op, 
	io_geom->stripe_offset = stripe_offset;

	io_geom->raid56_stripe_offset = raid56_full_stripe_start;



	return 0;

out:

	/* once for us */

	free_extent_map(em);

	return ret;

}



static int __btrfs_map_block(struct btrfs_fs_info *fs_info,

CRA Git | Maintained and supported by SUSTech CRA and CCSE