Commit 9678c543 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove custom crc32c init code 



The custom crc32 init code was introduced in
14a958e6 ("Btrfs: fix btrfs boot when compiled as built-in") to
enable using btrfs as a built-in. However, later as pointed out by
60efa5eb ("Btrfs: use late_initcall instead of module_init") this
wasn't enough and finally btrfs was switched to late_initcall which
comes after the generic crc32c implementation is initiliased. The
latter commit superseeded the former. Now that we don't have to
maintain our own code let's just remove it and switch to using the
generic implementation.

Despite touching a lot of files the patch is really simple. Here is the gist of
the changes:

1. Select LIBCRC32C rather than the low-level modules.
2. s/btrfs_crc32c/crc32c/g
3. replace hash.h with linux/crc32c.h
4. Move the btrfs namehash funcs to ctree.h and change the tree accordingly.

I've tested this with btrfs being both a module and a built-in and xfstest
doesn't complain.

Does seem to fix the longstanding problem of not automatically selectiong
the crc32c module when btrfs is used. Possibly there is a workaround in
dracut.

The modinfo confirms that now all the module dependencies are there:

before:
depends:        zstd_compress,zstd_decompress,raid6_pq,xor,zlib_deflate

after:
depends:        libcrc32c,zstd_compress,zstd_decompress,raid6_pq,xor,zlib_deflate

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
[ add more info to changelog from mails ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent df91f56a

fs/btrfs/Kconfig

+1 −2
Original line number Diff line number Diff line 
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/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ 
	   export.o tree-log.o free-space-cache.o zlib.o lzo.o zstd.o \

	   compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o \

	   reada.o backref.o ulist.o qgroup.o send.o dev-replace.o raid56.o \

	   uuid-tree.o props.o hash.o free-space-tree.o tree-checker.o

	   uuid-tree.o props.o free-space-tree.o tree-checker.o



btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o

fs/btrfs/check-integrity.c

+2 −2
Original line number Diff line number Diff line
@@ -96,9 +96,9 @@ 
#include <linux/blkdev.h>

#include <linux/mm.h>

#include <linux/string.h>

#include <linux/crc32c.h>

#include "ctree.h"

#include "disk-io.h"

#include "hash.h"

#include "transaction.h"

#include "extent_io.h"

#include "volumes.h"
@@ -1736,7 +1736,7 @@ static int btrfsic_test_for_metadata(struct btrfsic_state *state, 
		size_t sublen = i ? PAGE_SIZE :

				    (PAGE_SIZE - BTRFS_CSUM_SIZE);



		crc = btrfs_crc32c(crc, data, sublen);

		crc = crc32c(crc, data, sublen);

	}

	btrfs_csum_final(crc, csum);

	if (memcmp(csum, h->csum, state->csum_size))

fs/btrfs/ctree.h

+16 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <linux/sizes.h>

#include <linux/dynamic_debug.h>

#include <linux/refcount.h>

#include <linux/crc32c.h>

#include "extent_io.h"

#include "extent_map.h"

#include "async-thread.h"
@@ -98,6 +99,7 @@ static const int btrfs_csum_sizes[] = { 4 }; 


#define BTRFS_MAX_EXTENT_SIZE SZ_128M





/*

 * Count how many BTRFS_MAX_EXTENT_SIZE cover the @size

 */
@@ -2553,6 +2555,20 @@ BTRFS_SETGET_STACK_FUNCS(stack_dev_replace_cursor_right, 
	((unsigned long)(BTRFS_LEAF_DATA_OFFSET + \

	btrfs_item_offset_nr(leaf, slot)))



static inline u64 btrfs_name_hash(const char *name, int len)

{

       return crc32c((u32)~1, name, len);

}



/*

 * Figure the key offset of an extended inode ref

 */

static inline u64 btrfs_extref_hash(u64 parent_objectid, const char *name,

                                   int len)

{

       return (u64) crc32c(parent_objectid, name, len);

}



static inline bool btrfs_mixed_space_info(struct btrfs_space_info *space_info)

{

	return ((space_info->flags & BTRFS_BLOCK_GROUP_METADATA) &&

fs/btrfs/dir-item.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include "ctree.h"

#include "disk-io.h"

#include "hash.h"

#include "transaction.h"



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE