Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0496686 authored by Liu Bo's avatar Liu Bo Committed by Josef Bacik
Browse files

Btrfs: cleanup unused arguments of btrfs_csum_data 



Argument 'root' is no more used in btrfs_csum_data().

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
parent 08748810

fs/btrfs/compression.c

+1 −2
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ static int check_compressed_csum(struct inode *inode, 
				 u64 disk_start)

{

	int ret;

	struct btrfs_root *root = BTRFS_I(inode)->root;

	struct page *page;

	unsigned long i;

	char *kaddr;
@@ -121,7 +120,7 @@ static int check_compressed_csum(struct inode *inode, 
		csum = ~(u32)0;



		kaddr = kmap_atomic(page);

		csum = btrfs_csum_data(root, kaddr, csum, PAGE_CACHE_SIZE);

		csum = btrfs_csum_data(kaddr, csum, PAGE_CACHE_SIZE);

		btrfs_csum_final(csum, (char *)&csum);

		kunmap_atomic(kaddr);

fs/btrfs/disk-io.c

+3 −3
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static struct extent_map *btree_get_extent(struct inode *inode, 
	return em;

}



u32 btrfs_csum_data(struct btrfs_root *root, char *data, u32 seed, size_t len)

u32 btrfs_csum_data(char *data, u32 seed, size_t len)

{

	return crc32c(seed, data, len);

}
@@ -274,7 +274,7 @@ static int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf, 
		if (err)

			return 1;

		cur_len = min(len, map_len - (offset - map_start));

		crc = btrfs_csum_data(root, kaddr + offset - map_start,

		crc = btrfs_csum_data(kaddr + offset - map_start,

				      crc, cur_len);

		len -= cur_len;

		offset += cur_len;
@@ -2919,7 +2919,7 @@ static int write_dev_supers(struct btrfs_device *device, 
			btrfs_set_super_bytenr(sb, bytenr);



			crc = ~(u32)0;

			crc = btrfs_csum_data(NULL, (char *)sb +

			crc = btrfs_csum_data((char *)sb +

					      BTRFS_CSUM_SIZE, crc,

					      BTRFS_SUPER_INFO_SIZE -

					      BTRFS_CSUM_SIZE);

fs/btrfs/disk-io.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid, 
			  int atomic);

int btrfs_set_buffer_uptodate(struct extent_buffer *buf);

int btrfs_read_buffer(struct extent_buffer *buf, u64 parent_transid);

u32 btrfs_csum_data(struct btrfs_root *root, char *data, u32 seed, size_t len);

u32 btrfs_csum_data(char *data, u32 seed, size_t len);

void btrfs_csum_final(u32 crc, char *result);

int btrfs_bio_wq_end_io(struct btrfs_fs_info *info, struct bio *bio,

			int metadata);

fs/btrfs/file-item.c

+1 −2
Original line number Diff line number Diff line
@@ -484,8 +484,7 @@ int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode, 


		data = kmap_atomic(bvec->bv_page);

		sector_sum->sum = ~(u32)0;

		sector_sum->sum = btrfs_csum_data(root,

						  data + bvec->bv_offset,

		sector_sum->sum = btrfs_csum_data(data + bvec->bv_offset,

						  sector_sum->sum,

						  bvec->bv_len);

		kunmap_atomic(data);

fs/btrfs/free-space-cache.c

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

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



	crc = btrfs_csum_data(io_ctl->root, io_ctl->orig + offset, crc,

	crc = btrfs_csum_data(io_ctl->orig + offset, crc,

			      PAGE_CACHE_SIZE - offset);

	btrfs_csum_final(crc, (char *)&crc);

	io_ctl_unmap_page(io_ctl);
@@ -461,7 +461,7 @@ static int io_ctl_check_crc(struct io_ctl *io_ctl, int index) 
	kunmap(io_ctl->pages[0]);



	io_ctl_map_page(io_ctl, 0);

	crc = btrfs_csum_data(io_ctl->root, io_ctl->orig + offset, crc,

	crc = btrfs_csum_data(io_ctl->orig + offset, crc,

			      PAGE_CACHE_SIZE - offset);

	btrfs_csum_final(crc, (char *)&crc);

	if (val != crc) {