Commit 2c405192 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs fixes from David Sterba:

 - fix fast checksum detection, this affects filesystems with non-crc32c
   checksum, calculation would not be offloaded to worker threads

 - restore thread_pool mount option behaviour for endio workers, the new
   value for maximum active threads would not be set to the actual work
   queues

* tag 'for-6.3-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: fix fast csum implementation detection
  btrfs: restore the thread_pool= behavior in remount for the end I/O workqueues
parents 793cfd59 68d99ab0

fs/btrfs/disk-io.c

+14 −0
Original line number Diff line number Diff line
@@ -2250,6 +2250,20 @@ static int btrfs_init_csum_hash(struct btrfs_fs_info *fs_info, u16 csum_type) 


	fs_info->csum_shash = csum_shash;



	/*

	 * Check if the checksum implementation is a fast accelerated one.

	 * As-is this is a bit of a hack and should be replaced once the csum

	 * implementations provide that information themselves.

	 */

	switch (csum_type) {

	case BTRFS_CSUM_TYPE_CRC32:

		if (!strstr(crypto_shash_driver_name(csum_shash), "generic"))

			set_bit(BTRFS_FS_CSUM_IMPL_FAST, &fs_info->flags);

		break;

	default:

		break;

	}



	btrfs_info(fs_info, "using %s (%s) checksum algorithm",

			btrfs_super_csum_name(csum_type),

			crypto_shash_driver_name(csum_shash));

fs/btrfs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -1516,8 +1516,6 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type, 
		shrinker_debugfs_rename(&s->s_shrink, "sb-%s:%s", fs_type->name,

					s->s_id);

		btrfs_sb(s)->bdev_holder = fs_type;

		if (!strstr(crc32c_impl(), "generic"))

			set_bit(BTRFS_FS_CSUM_IMPL_FAST, &fs_info->flags);

		error = btrfs_fill_super(s, fs_devices, data);

	}

	if (!error)
@@ -1631,6 +1629,8 @@ static void btrfs_resize_thread_pool(struct btrfs_fs_info *fs_info, 
	btrfs_workqueue_set_max(fs_info->hipri_workers, new_pool_size);

	btrfs_workqueue_set_max(fs_info->delalloc_workers, new_pool_size);

	btrfs_workqueue_set_max(fs_info->caching_workers, new_pool_size);

	workqueue_set_max_active(fs_info->endio_workers, new_pool_size);

	workqueue_set_max_active(fs_info->endio_meta_workers, new_pool_size);

	btrfs_workqueue_set_max(fs_info->endio_write_workers, new_pool_size);

	btrfs_workqueue_set_max(fs_info->endio_freespace_worker, new_pool_size);

	btrfs_workqueue_set_max(fs_info->delayed_workers, new_pool_size);