Commit 03e86348 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: remove btrfs_crc32c wrapper 



This simply sends the same arguments into crc32c(), and is just used in
a few places.  Remove this wrapper and directly call crc32c() in these
instances.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 102f2640

fs/btrfs/ctree.h

+0 −5
Original line number Diff line number Diff line
@@ -470,11 +470,6 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info) 
#define BTRFS_BYTES_TO_BLKS(fs_info, bytes) \

				((bytes) >> (fs_info)->sectorsize_bits)



static inline u32 btrfs_crc32c(u32 crc, const void *address, unsigned length)

{

	return crc32c(crc, address, length);

}



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

{

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

fs/btrfs/extent-tree.c

+3 −3
Original line number Diff line number Diff line
@@ -399,11 +399,11 @@ u64 hash_extent_data_ref(u64 root_objectid, u64 owner, u64 offset) 
	__le64 lenum;



	lenum = cpu_to_le64(root_objectid);

	high_crc = btrfs_crc32c(high_crc, &lenum, sizeof(lenum));

	high_crc = crc32c(high_crc, &lenum, sizeof(lenum));

	lenum = cpu_to_le64(owner);

	low_crc = btrfs_crc32c(low_crc, &lenum, sizeof(lenum));

	low_crc = crc32c(low_crc, &lenum, sizeof(lenum));

	lenum = cpu_to_le64(offset);

	low_crc = btrfs_crc32c(low_crc, &lenum, sizeof(lenum));

	low_crc = crc32c(low_crc, &lenum, sizeof(lenum));



	return ((u64)high_crc << 31) ^ (u64)low_crc;

}

fs/btrfs/free-space-cache.c

+2 −2
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ static void io_ctl_set_crc(struct btrfs_io_ctl *io_ctl, int index) 
	if (index == 0)

		offset = sizeof(u32) * io_ctl->num_pages;



	crc = btrfs_crc32c(crc, io_ctl->orig + offset, PAGE_SIZE - offset);

	crc = crc32c(crc, io_ctl->orig + offset, PAGE_SIZE - offset);

	btrfs_crc32c_final(crc, (u8 *)&crc);

	io_ctl_unmap_page(io_ctl);

	tmp = page_address(io_ctl->pages[0]);
@@ -567,7 +567,7 @@ static int io_ctl_check_crc(struct btrfs_io_ctl *io_ctl, int index) 
	val = *tmp;



	io_ctl_map_page(io_ctl, 0);

	crc = btrfs_crc32c(crc, io_ctl->orig + offset, PAGE_SIZE - offset);

	crc = crc32c(crc, io_ctl->orig + offset, PAGE_SIZE - offset);

	btrfs_crc32c_final(crc, (u8 *)&crc);

	if (val != crc) {

		btrfs_err_rl(io_ctl->fs_info,

fs/btrfs/send.c

+3 −3
Original line number Diff line number Diff line
@@ -796,7 +796,7 @@ static int send_cmd(struct send_ctx *sctx) 
	put_unaligned_le32(sctx->send_size - sizeof(*hdr), &hdr->len);

	put_unaligned_le32(0, &hdr->crc);



	crc = btrfs_crc32c(0, (unsigned char *)sctx->send_buf, sctx->send_size);

	crc = crc32c(0, (unsigned char *)sctx->send_buf, sctx->send_size);

	put_unaligned_le32(crc, &hdr->crc);



	ret = write_buf(sctx->send_filp, sctx->send_buf, sctx->send_size,
@@ -5669,8 +5669,8 @@ static int send_encoded_extent(struct send_ctx *sctx, struct btrfs_path *path, 
	hdr = (struct btrfs_cmd_header *)sctx->send_buf;

	hdr->len = cpu_to_le32(sctx->send_size + disk_num_bytes - sizeof(*hdr));

	hdr->crc = 0;

	crc = btrfs_crc32c(0, sctx->send_buf, sctx->send_size);

	crc = btrfs_crc32c(crc, sctx->send_buf + data_offset, disk_num_bytes);

	crc = crc32c(0, sctx->send_buf, sctx->send_size);

	crc = crc32c(crc, sctx->send_buf + data_offset, disk_num_bytes);

	hdr->crc = cpu_to_le32(crc);



	ret = write_buf(sctx->send_filp, sctx->send_buf, sctx->send_size,