Commit a6f0bcf9 authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

btrfs: move csum related functions from ctree.c into fs.c 



The ctree module is about the implementation of the btree data structure
and not a place holder for generic filesystem things like the csum
algorithm details. Move the functions related to the csum algorithm
details away from ctree.c and into fs.c, which is a far better place for
them. Also fix missing punctuation in comments and change one multiline
comment to a single line comment since everything fits in under 80
characters.

For some reason this also slightly reduces the module's size.

Before this change:

  $ size fs/btrfs/btrfs.ko
     text	   data	    bss	    dec	    hex	filename
  1782126	 161045	  16920	1960091	 1de89b	fs/btrfs/btrfs.ko

After this change:

  $ size fs/btrfs/btrfs.ko
     text	   data	    bss	    dec	    hex	filename
  1782094	 161045	  16920	1960059	 1de87b	fs/btrfs/btrfs.ko

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent b815a78e

fs/btrfs/ctree.c

+0 −51
Original line number Diff line number Diff line
@@ -37,19 +37,6 @@ static int push_node_left(struct btrfs_trans_handle *trans, 
static int balance_node_right(struct btrfs_trans_handle *trans,

			      struct extent_buffer *dst_buf,

			      struct extent_buffer *src_buf);



static const struct btrfs_csums {

	u16		size;

	const char	name[10];

	const char	driver[12];

} btrfs_csums[] = {

	[BTRFS_CSUM_TYPE_CRC32] = { .size = 4, .name = "crc32c" },

	[BTRFS_CSUM_TYPE_XXHASH] = { .size = 8, .name = "xxhash64" },

	[BTRFS_CSUM_TYPE_SHA256] = { .size = 32, .name = "sha256" },

	[BTRFS_CSUM_TYPE_BLAKE2] = { .size = 32, .name = "blake2b",

				     .driver = "blake2b-256" },

};



/*

 * The leaf data grows from end-to-front in the node.  this returns the address

 * of the start of the last item, which is the stop of the leaf data stack.
@@ -148,44 +135,6 @@ static inline void copy_leaf_items(const struct extent_buffer *dst, 
			      nr_items * sizeof(struct btrfs_item));

}



/* This exists for btrfs-progs usages. */

u16 btrfs_csum_type_size(u16 type)

{

	return btrfs_csums[type].size;

}



int btrfs_super_csum_size(const struct btrfs_super_block *s)

{

	u16 t = btrfs_super_csum_type(s);

	/*

	 * csum type is validated at mount time

	 */

	return btrfs_csum_type_size(t);

}



const char *btrfs_super_csum_name(u16 csum_type)

{

	/* csum type is validated at mount time */

	return btrfs_csums[csum_type].name;

}



/*

 * Return driver name if defined, otherwise the name that's also a valid driver

 * name

 */

const char *btrfs_super_csum_driver(u16 csum_type)

{

	/* csum type is validated at mount time */

	return btrfs_csums[csum_type].driver[0] ?

		btrfs_csums[csum_type].driver :

		btrfs_csums[csum_type].name;

}



size_t __attribute_const__ btrfs_get_num_csums(void)

{

	return ARRAY_SIZE(btrfs_csums);

}



struct btrfs_path *btrfs_alloc_path(void)

{

	might_sleep();

fs/btrfs/ctree.h

+0 −6
Original line number Diff line number Diff line
@@ -756,12 +756,6 @@ static inline bool btrfs_is_data_reloc_root(const struct btrfs_root *root) 
	return root->root_key.objectid == BTRFS_DATA_RELOC_TREE_OBJECTID;

}



u16 btrfs_csum_type_size(u16 type);

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 __attribute_const__ btrfs_get_num_csums(void);



/*

 * We use folio flag owner_2 to indicate there is an ordered extent with

 * unfinished IO.

fs/btrfs/fs.c

+49 −0
Original line number Diff line number Diff line
@@ -5,6 +5,55 @@ 
#include "fs.h"

#include "accessors.h"



static const struct btrfs_csums {

	u16		size;

	const char	name[10];

	const char	driver[12];

} btrfs_csums[] = {

	[BTRFS_CSUM_TYPE_CRC32] = { .size = 4, .name = "crc32c" },

	[BTRFS_CSUM_TYPE_XXHASH] = { .size = 8, .name = "xxhash64" },

	[BTRFS_CSUM_TYPE_SHA256] = { .size = 32, .name = "sha256" },

	[BTRFS_CSUM_TYPE_BLAKE2] = { .size = 32, .name = "blake2b",

				     .driver = "blake2b-256" },

};



/* This exists for btrfs-progs usages. */

u16 btrfs_csum_type_size(u16 type)

{

	return btrfs_csums[type].size;

}



int btrfs_super_csum_size(const struct btrfs_super_block *s)

{

	u16 t = btrfs_super_csum_type(s);



	/* csum type is validated at mount time. */

	return btrfs_csum_type_size(t);

}



const char *btrfs_super_csum_name(u16 csum_type)

{

	/* csum type is validated at mount time. */

	return btrfs_csums[csum_type].name;

}



/*

 * Return driver name if defined, otherwise the name that's also a valid driver

 * name.

 */

const char *btrfs_super_csum_driver(u16 csum_type)

{

	/* csum type is validated at mount time */

	return btrfs_csums[csum_type].driver[0] ?

		btrfs_csums[csum_type].driver :

		btrfs_csums[csum_type].name;

}



size_t __attribute_const__ btrfs_get_num_csums(void)

{

	return ARRAY_SIZE(btrfs_csums);

}



void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, u64 flag,

			     const char *name)

{

fs/btrfs/fs.h

+6 −0
Original line number Diff line number Diff line
@@ -982,6 +982,12 @@ void btrfs_exclop_balance(struct btrfs_fs_info *fs_info, 


int btrfs_check_ioctl_vol_args_path(const struct btrfs_ioctl_vol_args *vol_args);



u16 btrfs_csum_type_size(u16 type);

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 __attribute_const__ btrfs_get_num_csums(void);



/* Compatibility and incompatibility defines */

void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, u64 flag,

			     const char *name);